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
This commit is contained in:
Marshall Greenblatt
2013-03-04 22:57:53 +00:00
parent f06e94716b
commit 6ff5977a46
2 changed files with 5 additions and 7 deletions

View File

@@ -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()) {
}

View File

@@ -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_;