diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 20:25:23 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 20:25:23 +0000 |
| commit | cb2edf23d2553c6e13d070a33f9f2b9613d21ab1 (patch) | |
| tree | 51c0b1125dba09b873d5f4bb6b63ae8c6ad35b17 /chrome/browser/chrome_content_browser_client.cc | |
| parent | 6ba8fcd3ec74b24afb75821236de78677081ad29 (diff) | |
| download | chromium_src-cb2edf23d2553c6e13d070a33f9f2b9613d21ab1.zip chromium_src-cb2edf23d2553c6e13d070a33f9f2b9613d21ab1.tar.gz chromium_src-cb2edf23d2553c6e13d070a33f9f2b9613d21ab1.tar.bz2 | |
Move the ViewType enum to extensions\common.
BUG=162530
Review URL: https://codereview.chromium.org/13375017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index b2907254e..33d1c22 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -79,7 +79,6 @@ #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/browser/user_style_sheet_watcher.h" #include "chrome/browser/user_style_sheet_watcher_factory.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -110,6 +109,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/common/child_process_host.h" #include "content/public/common/content_descriptors.h" +#include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" @@ -1847,7 +1847,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs( web_prefs->force_compositing_mode = true; WebContents* web_contents = WebContents::FromRenderViewHost(rvh); - chrome::ViewType view_type = chrome::GetViewType(web_contents); + extensions::ViewType view_type = extensions::GetViewType(web_contents); ExtensionService* service = extensions::ExtensionSystem::Get(profile)->extension_service(); if (service) { @@ -1863,9 +1863,9 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs( } } - if (view_type == chrome::VIEW_TYPE_NOTIFICATION) { + if (view_type == extensions::VIEW_TYPE_NOTIFICATION) { web_prefs->allow_scripts_to_close_windows = true; - } else if (view_type == chrome::VIEW_TYPE_BACKGROUND_CONTENTS) { + } else if (view_type == extensions::VIEW_TYPE_BACKGROUND_CONTENTS) { // Disable all kinds of acceleration for background pages. // See http://crbug.com/96005 and http://crbug.com/96006 web_prefs->force_compositing_mode = false; |