diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 23:31:25 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 23:31:25 +0000 |
| commit | 6717bf27e115a3745e0418688436139c58dac753 (patch) | |
| tree | 523fa301eeff4c292a140b56486e027bd075b0ed /content/common | |
| parent | d1c1aa2d06acaf9bf3f55734a72bb28835367370 (diff) | |
| download | chromium_src-6717bf27e115a3745e0418688436139c58dac753.zip chromium_src-6717bf27e115a3745e0418688436139c58dac753.tar.gz chromium_src-6717bf27e115a3745e0418688436139c58dac753.tar.bz2 | |
Quote WebPreferences in namespace webkit_glue.
To avoid name conflict when linking DumpRenderTree which has its own
implementation of the class with the same name.
BUG=127811
TEST=Build all without errors
TBR=kalman@chromium.org,dpapad@chromium.org,ben@chromium.org,battre@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10384128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/view_messages.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 4a89eb7..957b465 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -127,7 +127,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebKit::WebScreenInfo) IPC_STRUCT_TRAITS_MEMBER(availableRect) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(WebPreferences) +IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences) IPC_STRUCT_TRAITS_MEMBER(standard_font_family) IPC_STRUCT_TRAITS_MEMBER(fixed_font_family) IPC_STRUCT_TRAITS_MEMBER(serif_font_family) @@ -622,7 +622,7 @@ IPC_STRUCT_BEGIN(ViewMsg_New_Params) IPC_STRUCT_MEMBER(content::RendererPreferences, renderer_preferences) // Preferences for this view. - IPC_STRUCT_MEMBER(WebPreferences, web_preferences) + IPC_STRUCT_MEMBER(webkit_glue::WebPreferences, web_preferences) // The ID of the view to be created. IPC_STRUCT_MEMBER(int32, view_id) @@ -727,7 +727,7 @@ IPC_MESSAGE_ROUTED1(ViewMsg_SetRendererPrefs, // This passes a set of webkit preferences down to the renderer. IPC_MESSAGE_ROUTED1(ViewMsg_UpdateWebPreferences, - WebPreferences) + webkit_glue::WebPreferences) // Tells the render view to close. IPC_MESSAGE_ROUTED0(ViewMsg_Close) |