From 6ff5977a46328e71c7f792487c5f599716bc88a5 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Mon, 4 Mar 2013 22:57:53 +0000
Subject: [PATCH] Merge revision 1121 changes: - Mac: Fix compile error (issue
 #630).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1122 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/libcef/scheme_registrar_impl.cc | 6 ------
 cef1/libcef/scheme_registrar_impl.h  | 6 +++++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cef1/libcef/scheme_registrar_impl.cc b/cef1/libcef/scheme_registrar_impl.cc
index 0f2b78a84..71b003a99 100644
--- a/cef1/libcef/scheme_registrar_impl.cc
+++ b/cef1/libcef/scheme_registrar_impl.cc
@@ -12,12 +12,6 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 
-struct CefSchemeRegistrarImpl::SchemeInfo {
-  std::string scheme_name;
-  bool is_local;
-  bool is_display_isolated;
-};
-
 CefSchemeRegistrarImpl::CefSchemeRegistrarImpl()
     : supported_thread_id_(base::PlatformThread::CurrentId()) {
 }
diff --git a/cef1/libcef/scheme_registrar_impl.h b/cef1/libcef/scheme_registrar_impl.h
index 6fc673f43..ca14cbbcf 100644
--- a/cef1/libcef/scheme_registrar_impl.h
+++ b/cef1/libcef/scheme_registrar_impl.h
@@ -38,7 +38,11 @@ class CefSchemeRegistrarImpl : public CefSchemeRegistrar {
   base::PlatformThreadId supported_thread_id_;
 
   // Custom schemes that need to be registered with WebKit.
-  struct SchemeInfo;
+  struct SchemeInfo {
+    std::string scheme_name;
+    bool is_local;
+    bool is_display_isolated;
+  };
   typedef std::list<SchemeInfo> SchemeInfoList;
   SchemeInfoList scheme_info_list_;