summaryrefslogtreecommitdiffstats
path: root/content/browser/webui/web_ui.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 18:13:21 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 18:13:21 +0000
commite091df891e7e86d0b7fdbfba7e784b9094aed09f (patch)
treed3ddf7cba52bd2c145f360efb81fc0dfc7b298a6 /content/browser/webui/web_ui.cc
parenta867a7ed5b258420d4eafd416e4d295a87af0de0 (diff)
downloadchromium_src-e091df891e7e86d0b7fdbfba7e784b9094aed09f.zip
chromium_src-e091df891e7e86d0b7fdbfba7e784b9094aed09f.tar.gz
chromium_src-e091df891e7e86d0b7fdbfba7e784b9094aed09f.tar.bz2
Move BindingsPolicy enum to content\public\common and put it in the content namespace. I've also renamed the value names to match the style that we use in the WebKit API (i.e. all values in an enum start with the enum's name) since it's more readable. As we move other enums to public we should switch them over as well.
BUG=98716 Review URL: http://codereview.chromium.org/8220024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui/web_ui.cc')
-rw-r--r--content/browser/webui/web_ui.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc
index 59e2a07..206d221 100644
--- a/content/browser/webui/web_ui.cc
+++ b/content/browser/webui/web_ui.cc
@@ -16,8 +16,8 @@
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_view.h"
#include "content/browser/webui/generic_handler.h"
-#include "content/common/bindings_policy.h"
#include "content/common/view_messages.h"
+#include "content/public/common/bindings_policy.h"
#include "ipc/ipc_message.h"
#include "ipc/ipc_message_macros.h"
@@ -43,7 +43,7 @@ WebUI::WebUI(TabContents* contents)
focus_location_bar_by_default_(false),
should_hide_url_(false),
link_transition_type_(PageTransition::LINK),
- bindings_(BindingsPolicy::WEB_UI),
+ bindings_(content::BINDINGS_POLICY_WEB_UI),
register_callback_overwrites_(false),
tab_contents_(contents) {
DCHECK(contents);
@@ -102,7 +102,7 @@ void WebUI::OnWebUISend(const GURL& source_url,
void WebUI::RenderViewCreated(RenderViewHost* render_view_host) {
// Do not attempt to set the toolkit property if WebUI is not enabled, e.g.,
// the bookmarks manager page.
- if (!(bindings_ & BindingsPolicy::WEB_UI))
+ if (!(bindings_ & content::BINDINGS_POLICY_WEB_UI))
return;
#if defined(TOOLKIT_VIEWS)