diff options
49 files changed, 241 insertions, 247 deletions
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc index 6c7525e..71a847b 100644 --- a/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc @@ -26,11 +26,11 @@ #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" -#include "chrome/browser/view_type_utils.h" #include "components/autofill/browser/autofill_external_delegate.h" #include "components/autofill/browser/autofill_manager.h" #include "content/public/browser/android/content_view_core.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #include "jni/TabBase_jni.h" using content::WebContents; @@ -54,7 +54,7 @@ void BrowserTabContents::AttachTabHelpers(WebContents* contents) { new base::SupportsUserData::Data()); // Set the view type. - chrome::SetViewType(contents, chrome::VIEW_TYPE_TAB_CONTENTS); + extensions::SetViewType(contents, extensions::VIEW_TYPE_TAB_CONTENTS); // SessionTabHelper comes first because it sets up the tab ID, and other // helpers may rely on that. diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index ea1cfa1..4f2a939 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -71,7 +71,6 @@ #include "chrome/common/content_settings_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest.h" -#include "chrome/common/view_type.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" @@ -79,6 +78,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/process_type.h" +#include "extensions/common/view_type.h" #include "googleurl/src/gurl.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/rect.h" @@ -2772,7 +2772,7 @@ void ExtensionPopupObserver::Observe( extensions::ExtensionHost* host = content::Details<extensions::ExtensionHost>(details).ptr(); if (host->extension_id() == extension_id_ && - host->extension_host_type() == chrome::VIEW_TYPE_EXTENSION_POPUP) { + host->extension_host_type() == extensions::VIEW_TYPE_EXTENSION_POPUP) { AutomationJSONReply(automation_, reply_message_.release()) .SendSuccess(NULL); delete this; diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 1013bf7..8dd16f2 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -30,13 +30,13 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/automation_id.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" @@ -470,17 +470,17 @@ AutomationId GetIdForExtensionView( const content::RenderViewHost* render_view_host) { AutomationId::Type type; WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); - switch (chrome::GetViewType(web_contents)) { - case chrome::VIEW_TYPE_EXTENSION_POPUP: + switch (extensions::GetViewType(web_contents)) { + case extensions::VIEW_TYPE_EXTENSION_POPUP: type = AutomationId::kTypeExtensionPopup; break; - case chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE: + case extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE: type = AutomationId::kTypeExtensionBgPage; break; - case chrome::VIEW_TYPE_EXTENSION_INFOBAR: + case extensions::VIEW_TYPE_EXTENSION_INFOBAR: type = AutomationId::kTypeExtensionInfobar; break; - case chrome::VIEW_TYPE_APP_SHELL: + case extensions::VIEW_TYPE_APP_SHELL: type = AutomationId::kTypeAppShell; break; default: diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 5c1f75d..da6c320 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -108,7 +108,6 @@ #include "chrome/browser/ui/omnibox/omnibox_view.h" #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" #include "chrome/browser/ui/startup/startup_types.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_events.h" #include "chrome/common/automation_id.h" @@ -140,6 +139,7 @@ #include "content/public/common/common_param_traits.h" #include "content/public/common/geoposition.h" #include "content/public/common/ssl_status.h" +#include "extensions/browser/view_type_utils.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" #include "net/cookies/cookie_store.h" @@ -2386,24 +2386,24 @@ void TestingAutomationProvider::GetBrowserInfo( std::string type; WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); - chrome::ViewType view_type = chrome::GetViewType(web_contents); + extensions::ViewType view_type = extensions::GetViewType(web_contents); switch (view_type) { - case chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE: + case extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE: type = "EXTENSION_BACKGROUND_PAGE"; break; - case chrome::VIEW_TYPE_EXTENSION_POPUP: + case extensions::VIEW_TYPE_EXTENSION_POPUP: type = "EXTENSION_POPUP"; break; - case chrome::VIEW_TYPE_EXTENSION_INFOBAR: + case extensions::VIEW_TYPE_EXTENSION_INFOBAR: type = "EXTENSION_INFOBAR"; break; - case chrome::VIEW_TYPE_EXTENSION_DIALOG: + case extensions::VIEW_TYPE_EXTENSION_DIALOG: type = "EXTENSION_DIALOG"; break; - case chrome::VIEW_TYPE_APP_SHELL: + case extensions::VIEW_TYPE_APP_SHELL: type = "APP_SHELL"; break; - case chrome::VIEW_TYPE_PANEL: + case extensions::VIEW_TYPE_PANEL: type = "PANEL"; break; default: 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; diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 43db798..8608f27 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -23,13 +23,13 @@ #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/view_type_utils.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/webui/web_ui_util.h" @@ -402,7 +402,7 @@ bool BookmarkManagerPrivateStartDragFunction::RunImpl() { WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host_); - if (chrome::GetViewType(web_contents) == chrome::VIEW_TYPE_TAB_CONTENTS) { + if (GetViewType(web_contents) == VIEW_TYPE_TAB_CONTENTS) { WebContents* web_contents = dispatcher()->delegate()->GetAssociatedWebContents(); CHECK(web_contents); @@ -445,7 +445,7 @@ bool BookmarkManagerPrivateDropFunction::RunImpl() { WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host_); - if (chrome::GetViewType(web_contents) == chrome::VIEW_TYPE_TAB_CONTENTS) { + if (GetViewType(web_contents) == VIEW_TYPE_TAB_CONTENTS) { WebContents* web_contents = dispatcher()->delegate()->GetAssociatedWebContents(); CHECK(web_contents); diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index d867db9..e6815bb 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -25,7 +25,6 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/extensions/api/developer_private.h" #include "chrome/common/extensions/api/icons/icons_handler.h" #include "chrome/common/extensions/background_info.h" @@ -37,6 +36,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "extensions/common/extension_resource.h" #include "grit/chromium_strings.h" @@ -228,9 +228,9 @@ void DeveloperPrivateGetItemsInfoFunction:: content::RenderViewHost* host = *iter; content::WebContents* web_contents = content::WebContents::FromRenderViewHost(host); - chrome::ViewType host_type = chrome::GetViewType(web_contents); - if (chrome::VIEW_TYPE_EXTENSION_POPUP == host_type || - chrome::VIEW_TYPE_EXTENSION_DIALOG == host_type) + ViewType host_type = GetViewType(web_contents); + if (VIEW_TYPE_EXTENSION_POPUP == host_type || + VIEW_TYPE_EXTENSION_DIALOG == host_type) continue; content::RenderProcessHost* process = host->GetProcess(); diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc index be369e5..aae6a25 100644 --- a/chrome/browser/extensions/api/messaging/message_service.cc +++ b/chrome/browser/extensions/api/messaging/message_service.cc @@ -26,7 +26,6 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/incognito_handler.h" -#include "chrome/common/view_type.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index 6be3d50..75c809f 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -17,7 +17,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/api/web_navigation.h" #include "content/public/browser/navigation_details.h" @@ -28,6 +27,7 @@ #include "content/public/browser/resource_request_details.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "extensions/browser/view_type_utils.h" #include "net/base/net_errors.h" namespace GetFrame = extensions::api::web_navigation::GetFrame; @@ -119,7 +119,7 @@ void WebNavigationEventRouter::TabReplacedAt( if (!tab_observer) { // If you hit this DCHECK(), please add reproduction steps to // http://crbug.com/109464. - DCHECK(chrome::GetViewType(old_contents) != chrome::VIEW_TYPE_TAB_CONTENTS); + DCHECK(GetViewType(old_contents) != VIEW_TYPE_TAB_CONTENTS); return; } const FrameNavigationState& frame_navigation_state = @@ -167,8 +167,7 @@ void WebNavigationEventRouter::Retargeting(const RetargetingDetails* details) { if (!tab_observer) { // If you hit this DCHECK(), please add reproduction steps to // http://crbug.com/109464. - DCHECK(chrome::GetViewType(details->source_web_contents) != - chrome::VIEW_TYPE_TAB_CONTENTS); + DCHECK(GetViewType(details->source_web_contents) != VIEW_TYPE_TAB_CONTENTS); return; } const FrameNavigationState& frame_navigation_state = @@ -822,8 +821,7 @@ WebNavigationAPI::GetFactoryInstance() { return &g_factory.Get(); } -void WebNavigationAPI::OnListenerAdded( - const extensions::EventListenerInfo& details) { +void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) { web_navigation_event_router_.reset(new WebNavigationEventRouter(profile_)); ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this); } diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc index c21c4a3..769ced8 100644 --- a/chrome/browser/extensions/event_router.cc +++ b/chrome/browser/extensions/event_router.cc @@ -33,7 +33,6 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/incognito_handler.h" -#include "chrome/common/view_type.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 7016a29..1843520 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -29,7 +29,6 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/background_info.h" @@ -48,6 +47,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/view_type_utils.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -128,7 +128,7 @@ class ExtensionHost::ProcessCreationQueue { ExtensionHost::ExtensionHost(const Extension* extension, SiteInstance* site_instance, const GURL& url, - chrome::ViewType host_type) + ViewType host_type) : extension_(extension), extension_id_(extension->id()), profile_(Profile::FromBrowserContext( @@ -145,7 +145,7 @@ ExtensionHost::ExtensionHost(const Extension* extension, WebContents::CreateParams(profile_, site_instance))), content::WebContentsObserver::Observe(host_contents_.get()); host_contents_->SetDelegate(this); - chrome::SetViewType(host_contents_.get(), host_type); + SetViewType(host_contents_.get(), host_type); PrefsTabHelper::CreateForWebContents(host_contents()); @@ -158,7 +158,7 @@ ExtensionHost::ExtensionHost(const Extension* extension, } ExtensionHost::~ExtensionHost() { - if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE && + if (extension_host_type_ == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE && extension_ && BackgroundInfo::HasLazyBackgroundPage(extension_)) { UMA_HISTOGRAM_LONG_TIMES("Extensions.EventPageActiveTime", since_created_.Elapsed()); @@ -238,13 +238,12 @@ void ExtensionHost::CreateRenderViewNow() { LoadInitialURL(); if (is_background_page()) { DCHECK(IsRenderViewLive()); - extensions::ExtensionSystem::Get(profile_)->extension_service()-> + ExtensionSystem::Get(profile_)->extension_service()-> DidCreateRenderViewForBackgroundPage(this); } } -extensions::WindowController* -ExtensionHost::GetExtensionWindowController() const { +WindowController* ExtensionHost::GetExtensionWindowController() const { return view() && view()->browser() ? view()->browser()->extension_window_controller() : NULL; } @@ -255,7 +254,7 @@ const GURL& ExtensionHost::GetURL() const { void ExtensionHost::LoadInitialURL() { if (!is_background_page() && - !extensions::ExtensionSystem::Get(profile_)->extension_service()-> + !ExtensionSystem::Get(profile_)->extension_service()-> IsBackgroundPageReady(extension_)) { // Make sure the background page loads before any others. registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY, @@ -280,7 +279,7 @@ void ExtensionHost::Observe(int type, const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY: - DCHECK(extensions::ExtensionSystem::Get(profile_)->extension_service()-> + DCHECK(ExtensionSystem::Get(profile_)->extension_service()-> IsBackgroundPageReady(extension_)); LoadInitialURL(); break; @@ -350,17 +349,17 @@ void ExtensionHost::InsertInfobarCSS() { void ExtensionHost::DidStopLoading(content::RenderViewHost* render_view_host) { bool notify = !did_stop_loading_; did_stop_loading_ = true; - if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP || - extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_DIALOG || - extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR || - extension_host_type_ == chrome::VIEW_TYPE_PANEL) { + if (extension_host_type_ == VIEW_TYPE_EXTENSION_POPUP || + extension_host_type_ == VIEW_TYPE_EXTENSION_DIALOG || + extension_host_type_ == VIEW_TYPE_EXTENSION_INFOBAR || + extension_host_type_ == VIEW_TYPE_PANEL) { #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX) if (view()) view()->DidStopLoading(); #endif } if (notify) { - if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + if (extension_host_type_ == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { if (extension_ && BackgroundInfo::HasLazyBackgroundPage(extension_)) { UMA_HISTOGRAM_TIMES("Extensions.EventPageLoadTime", since_created_.Elapsed()); @@ -368,16 +367,16 @@ void ExtensionHost::DidStopLoading(content::RenderViewHost* render_view_host) { UMA_HISTOGRAM_TIMES("Extensions.BackgroundPageLoadTime", since_created_.Elapsed()); } - } else if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_DIALOG) { + } else if (extension_host_type_ == VIEW_TYPE_EXTENSION_DIALOG) { UMA_HISTOGRAM_TIMES("Extensions.DialogLoadTime", since_created_.Elapsed()); - } else if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP) { + } else if (extension_host_type_ == VIEW_TYPE_EXTENSION_POPUP) { UMA_HISTOGRAM_TIMES("Extensions.PopupLoadTime", since_created_.Elapsed()); - } else if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR) { + } else if (extension_host_type_ == VIEW_TYPE_EXTENSION_INFOBAR) { UMA_HISTOGRAM_TIMES("Extensions.InfobarLoadTime", since_created_.Elapsed()); - } else if (extension_host_type_ == chrome::VIEW_TYPE_PANEL) { + } else if (extension_host_type_ == VIEW_TYPE_PANEL) { UMA_HISTOGRAM_TIMES("Extensions.PanelLoadTime", since_created_.Elapsed()); } @@ -398,11 +397,11 @@ void ExtensionHost::DocumentAvailableInMainFrame() { document_element_available_ = true; if (is_background_page()) { - extensions::ExtensionSystem::Get(profile_)->extension_service()-> + ExtensionSystem::Get(profile_)->extension_service()-> SetBackgroundPageReady(extension_); } else { switch (extension_host_type_) { - case chrome::VIEW_TYPE_EXTENSION_INFOBAR: + case VIEW_TYPE_EXTENSION_INFOBAR: InsertInfobarCSS(); break; default: @@ -413,11 +412,11 @@ void ExtensionHost::DocumentAvailableInMainFrame() { void ExtensionHost::CloseContents(WebContents* contents) { // TODO(mpcomplete): is this check really necessary? - if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP || - extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_DIALOG || - extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE || - extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_INFOBAR || - extension_host_type_ == chrome::VIEW_TYPE_PANEL) { + if (extension_host_type_ == VIEW_TYPE_EXTENSION_POPUP || + extension_host_type_ == VIEW_TYPE_EXTENSION_DIALOG || + extension_host_type_ == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE || + extension_host_type_ == VIEW_TYPE_EXTENSION_INFOBAR || + extension_host_type_ == VIEW_TYPE_PANEL) { Close(); } } @@ -460,7 +459,7 @@ WebContents* ExtensionHost::OpenURLFromTab(WebContents* source, bool ExtensionHost::PreHandleKeyboardEvent(WebContents* source, const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { - if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP && + if (extension_host_type_ == VIEW_TYPE_EXTENSION_POPUP && event.type == NativeWebKeyboardEvent::RawKeyDown && event.windowsKeyCode == ui::VKEY_ESCAPE) { DCHECK(is_keyboard_shortcut != NULL); @@ -479,7 +478,7 @@ bool ExtensionHost::PreHandleKeyboardEvent(WebContents* source, void ExtensionHost::HandleKeyboardEvent(WebContents* source, const NativeWebKeyboardEvent& event) { - if (extension_host_type_ == chrome::VIEW_TYPE_EXTENSION_POPUP) { + if (extension_host_type_ == VIEW_TYPE_EXTENSION_POPUP) { if (event.type == NativeWebKeyboardEvent::RawKeyDown && event.windowsKeyCode == ui::VKEY_ESCAPE) { Close(); @@ -508,8 +507,7 @@ void ExtensionHost::OnRequest(const ExtensionHostMsg_Request_Params& params) { } void ExtensionHost::OnEventAck() { - extensions::EventRouter* router = - ExtensionSystem::Get(profile_)->event_router(); + EventRouter* router = ExtensionSystem::Get(profile_)->event_router(); if (router) router->OnEventAck(profile_, extension_id()); } @@ -555,7 +553,7 @@ void ExtensionHost::RenderViewCreated(RenderViewHost* render_view_host) { // If the host is bound to a window, then extract its id. Extensions hosted // in ExternalTabContainer objects may not have an associated window. - extensions::WindowController* window = GetExtensionWindowController(); + WindowController* window = GetExtensionWindowController(); if (window) { render_view_host->Send(new ExtensionMsg_UpdateBrowserWindowId( render_view_host->GetRoutingID(), window->GetWindowId())); diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h index 1be7ae6..06a8cde 100644 --- a/chrome/browser/extensions/extension_host.h +++ b/chrome/browser/extensions/extension_host.h @@ -12,12 +12,12 @@ #include "base/memory/scoped_ptr.h" #include "base/perftimer.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/common/view_type.h" #include "content/public/browser/javascript_dialog_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/common/view_type.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/extensions/extension_view_views.h" @@ -66,7 +66,7 @@ class ExtensionHost : public content::WebContentsDelegate, ExtensionHost(const Extension* extension, content::SiteInstance* site_instance, - const GURL& url, chrome::ViewType host_type); + const GURL& url, ViewType host_type); virtual ~ExtensionHost(); #if defined(TOOLKIT_VIEWS) @@ -105,7 +105,7 @@ class ExtensionHost : public content::WebContentsDelegate, Profile* profile() const { return profile_; } - chrome::ViewType extension_host_type() const { return extension_host_type_; } + ViewType extension_host_type() const { return extension_host_type_; } const GURL& GetURL() const; // ExtensionFunctionDispatcher::Delegate @@ -188,8 +188,7 @@ class ExtensionHost : public content::WebContentsDelegate, void Close(); // ExtensionFunctionDispatcher::Delegate - virtual extensions::WindowController* - GetExtensionWindowController() const OVERRIDE; + virtual WindowController* GetExtensionWindowController() const OVERRIDE; // Message handlers. void OnRequest(const ExtensionHostMsg_Request_Params& params); @@ -247,7 +246,7 @@ class ExtensionHost : public content::WebContentsDelegate, ExtensionFunctionDispatcher extension_function_dispatcher_; // The type of view being hosted. - chrome::ViewType extension_host_type_; + ViewType extension_host_type_; // The relevant WebContents associated with this ExtensionHost, if any. content::WebContents* associated_web_contents_; diff --git a/chrome/browser/extensions/extension_host_mac.h b/chrome/browser/extensions/extension_host_mac.h index 9ec2d9a..041660b 100644 --- a/chrome/browser/extensions/extension_host_mac.h +++ b/chrome/browser/extensions/extension_host_mac.h @@ -14,9 +14,10 @@ class Extension; // now that ExtensionHost is restructured to rely on WebContents. class ExtensionHostMac : public ExtensionHost { public: - ExtensionHostMac(const extensions::Extension* extension, + ExtensionHostMac(const Extension* extension, content::SiteInstance* site_instance, - const GURL& url, chrome::ViewType host_type) : + const GURL& url, + ViewType host_type) : ExtensionHost(extension, site_instance, url, host_type) {} virtual ~ExtensionHostMac(); diff --git a/chrome/browser/extensions/extension_host_mac.mm b/chrome/browser/extensions/extension_host_mac.mm index 507216b..3a9386f 100644 --- a/chrome/browser/extensions/extension_host_mac.mm +++ b/chrome/browser/extensions/extension_host_mac.mm @@ -7,7 +7,6 @@ #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" -#include "chrome/common/view_type.h" #include "content/public/browser/native_web_keyboard_event.h" using content::NativeWebKeyboardEvent; @@ -29,7 +28,7 @@ void ExtensionHostMac::UnhandledKeyboardEvent( content::WebContents* source, const NativeWebKeyboardEvent& event) { if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char || - extension_host_type() != chrome::VIEW_TYPE_EXTENSION_POPUP) { + extension_host_type() != VIEW_TYPE_EXTENSION_POPUP) { return; } diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index f529bed..a4cb67f 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/extensions/extension_process_manager.h" + #include "base/bind.h" #include "base/command_line.h" #include "base/lazy_instance.h" @@ -14,7 +16,6 @@ #include "chrome/browser/extensions/api/runtime/runtime_api.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_info_map.h" -#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -22,7 +23,6 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/background_info.h" @@ -40,6 +40,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/renderer_preferences.h" +#include "extensions/browser/view_type_utils.h" #if defined(OS_MACOSX) #include "chrome/browser/extensions/extension_host_mac.h" @@ -78,7 +79,7 @@ class IncognitoExtensionProcessManager : public ExtensionProcessManager { const Extension* extension, const GURL& url, Browser* browser, - chrome::ViewType view_type) OVERRIDE; + extensions::ViewType view_type) OVERRIDE; virtual void CreateBackgroundHost(const Extension* extension, const GURL& url) OVERRIDE; virtual SiteInstance* GetSiteInstanceForURL(const GURL& url) OVERRIDE; @@ -203,18 +204,18 @@ ExtensionProcessManager::GetAllViews() const { void ExtensionProcessManager::EnsureBrowserWhenRequired( Browser* browser, - chrome::ViewType view_type) { + extensions::ViewType view_type) { if (!browser) { #if defined (OS_CHROMEOS) // On ChromeOS we'll only use ExtensionView, which // does not use the browser parameter. // TODO(rkc): Remove all this once we create a new host for // screensaver extensions (crosbug.com/28211). - DCHECK(view_type == chrome::VIEW_TYPE_EXTENSION_POPUP || - view_type == chrome::VIEW_TYPE_EXTENSION_DIALOG); + DCHECK(view_type == extensions::VIEW_TYPE_EXTENSION_POPUP || + view_type == extensions::VIEW_TYPE_EXTENSION_DIALOG); #else // A NULL browser may only be given for pop-up views. - DCHECK(view_type == chrome::VIEW_TYPE_EXTENSION_POPUP); + DCHECK(view_type == extensions::VIEW_TYPE_EXTENSION_POPUP); #endif } } @@ -224,7 +225,7 @@ ExtensionHost* ExtensionProcessManager::CreateViewHost( const Extension* extension, const GURL& url, Browser* browser, - chrome::ViewType view_type) { + extensions::ViewType view_type) { DCHECK(extension); EnsureBrowserWhenRequired(browser, view_type); ExtensionHost* host = @@ -240,7 +241,7 @@ ExtensionHost* ExtensionProcessManager::CreateViewHost( } ExtensionHost* ExtensionProcessManager::CreateViewHost( - const GURL& url, Browser* browser, chrome::ViewType view_type) { + const GURL& url, Browser* browser, extensions::ViewType view_type) { EnsureBrowserWhenRequired(browser, view_type); ExtensionService* service = GetProfile()->GetExtensionService(); if (service) { @@ -259,27 +260,27 @@ ExtensionHost* ExtensionProcessManager::CreateViewHost( ExtensionHost* ExtensionProcessManager::CreatePopupHost( const Extension* extension, const GURL& url, Browser* browser) { return CreateViewHost( - extension, url, browser, chrome::VIEW_TYPE_EXTENSION_POPUP); + extension, url, browser, extensions::VIEW_TYPE_EXTENSION_POPUP); } ExtensionHost* ExtensionProcessManager::CreatePopupHost( const GURL& url, Browser* browser) { - return CreateViewHost(url, browser, chrome::VIEW_TYPE_EXTENSION_POPUP); + return CreateViewHost(url, browser, extensions::VIEW_TYPE_EXTENSION_POPUP); } ExtensionHost* ExtensionProcessManager::CreateDialogHost(const GURL& url) { - return CreateViewHost(url, NULL, chrome::VIEW_TYPE_EXTENSION_DIALOG); + return CreateViewHost(url, NULL, extensions::VIEW_TYPE_EXTENSION_DIALOG); } ExtensionHost* ExtensionProcessManager::CreateInfobarHost( const Extension* extension, const GURL& url, Browser* browser) { return CreateViewHost( - extension, url, browser, chrome::VIEW_TYPE_EXTENSION_INFOBAR); + extension, url, browser, extensions::VIEW_TYPE_EXTENSION_INFOBAR); } ExtensionHost* ExtensionProcessManager::CreateInfobarHost( const GURL& url, Browser* browser) { - return CreateViewHost(url, browser, chrome::VIEW_TYPE_EXTENSION_INFOBAR); + return CreateViewHost(url, browser, extensions::VIEW_TYPE_EXTENSION_INFOBAR); } void ExtensionProcessManager::CreateBackgroundHost( @@ -297,10 +298,10 @@ void ExtensionProcessManager::CreateBackgroundHost( #if defined(OS_MACOSX) new extensions::ExtensionHostMac( extension, GetSiteInstanceForURL(url), url, - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); + extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); #else new ExtensionHost(extension, GetSiteInstanceForURL(url), url, - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); + extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); #endif host->CreateRenderViewSoon(); @@ -385,12 +386,12 @@ void ExtensionProcessManager::UnregisterRenderViewHost( content::Source<Profile>(GetProfile()), content::Details<RenderViewHost>(render_view_host)); - chrome::ViewType view_type = view->second; + extensions::ViewType view_type = view->second; all_extension_views_.erase(view); // Keepalive count, balanced in RegisterRenderViewHost. - if (view_type != chrome::VIEW_TYPE_INVALID && - view_type != chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + if (view_type != extensions::VIEW_TYPE_INVALID && + view_type != extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { const Extension* extension = GetExtensionForRenderViewHost( render_view_host); if (extension) @@ -406,7 +407,8 @@ void ExtensionProcessManager::RegisterRenderViewHost( return; WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); - all_extension_views_[render_view_host] = chrome::GetViewType(web_contents); + all_extension_views_[render_view_host] = + extensions::GetViewType(web_contents); // Keep the lazy background page alive as long as any non-background-page // extension views are visible. Keepalive count balanced in @@ -466,9 +468,9 @@ void ExtensionProcessManager::IncrementLazyKeepaliveCountForView( RenderViewHost* render_view_host) { WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); - chrome::ViewType view_type = chrome::GetViewType(web_contents); - if (view_type != chrome::VIEW_TYPE_INVALID && - view_type != chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + extensions::ViewType view_type = extensions::GetViewType(web_contents); + if (view_type != extensions::VIEW_TYPE_INVALID && + view_type != extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { const Extension* extension = GetExtensionForRenderViewHost( render_view_host); if (extension) @@ -637,7 +639,7 @@ void ExtensionProcessManager::Observe( case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: { ExtensionHost* host = content::Details<ExtensionHost>(details).ptr(); if (host->extension_host_type() == - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { CloseBackgroundHost(host); } break; @@ -696,8 +698,8 @@ void ExtensionProcessManager::Observe( WebContents::FromRenderViewHost(render_view_host); // Keep the lazy background page alive while it's being inspected. // Balanced in response to the CLOSING notification. - if (chrome::GetViewType(web_contents) == - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + if (extensions::GetViewType(web_contents) == + extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { const Extension* extension = GetExtensionForRenderViewHost( render_view_host); if (extension) { @@ -714,8 +716,8 @@ void ExtensionProcessManager::Observe( WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); // Balanced in response to the OPENING notification. - if (chrome::GetViewType(web_contents) == - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + if (extensions::GetViewType(web_contents) == + extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { const Extension* extension = GetExtensionForRenderViewHost( render_view_host); if (extension) @@ -769,7 +771,7 @@ void ExtensionProcessManager::OnExtensionHostCreated(ExtensionHost* host, void ExtensionProcessManager::CloseBackgroundHost(ExtensionHost* host) { CHECK(host->extension_host_type() == - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); + extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); delete host; // |host| should deregister itself from our structures. CHECK(background_hosts_.find(host) == background_hosts_.end()); @@ -838,7 +840,7 @@ ExtensionHost* IncognitoExtensionProcessManager::CreateViewHost( const Extension* extension, const GURL& url, Browser* browser, - chrome::ViewType view_type) { + extensions::ViewType view_type) { if (extensions::IncognitoInfo::IsSplitMode(extension)) { if (IsIncognitoEnabled(extension)) { return ExtensionProcessManager::CreateViewHost(extension, url, diff --git a/chrome/browser/extensions/extension_process_manager.h b/chrome/browser/extensions/extension_process_manager.h index ae36376..d0c747c 100644 --- a/chrome/browser/extensions/extension_process_manager.h +++ b/chrome/browser/extensions/extension_process_manager.h @@ -13,9 +13,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time.h" -#include "chrome/common/view_type.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/common/view_type.h" class Browser; class GURL; @@ -56,10 +56,10 @@ class ExtensionProcessManager : public content::NotificationObserver { const extensions::Extension* extension, const GURL& url, Browser* browser, - chrome::ViewType view_type); + extensions::ViewType view_type); extensions::ExtensionHost* CreateViewHost(const GURL& url, - Browser* browser, - chrome::ViewType view_type); + Browser* browser, + extensions::ViewType view_type); extensions::ExtensionHost* CreatePopupHost( const extensions::Extension* extension, const GURL& url, @@ -177,14 +177,14 @@ class ExtensionProcessManager : public content::NotificationObserver { typedef std::string ExtensionId; typedef std::map<ExtensionId, BackgroundPageData> BackgroundPageDataMap; typedef std::map<content::RenderViewHost*, - chrome::ViewType> ExtensionRenderViews; + extensions::ViewType> ExtensionRenderViews; // Close the given |host| iff it's a background page. void CloseBackgroundHost(extensions::ExtensionHost* host); // Ensure browser object is not null except for certain situations. void EnsureBrowserWhenRequired(Browser* browser, - chrome::ViewType view_type); + extensions::ViewType view_type); // These are called when the extension transitions between idle and active. // They control the process of closing the background page when idle. diff --git a/chrome/browser/extensions/extension_webkit_preferences.cc b/chrome/browser/extensions/extension_webkit_preferences.cc index b9190f5..e14e176 100644 --- a/chrome/browser/extensions/extension_webkit_preferences.cc +++ b/chrome/browser/extensions/extension_webkit_preferences.cc @@ -13,7 +13,7 @@ namespace extension_webkit_preferences { void SetPreferences(const extensions::Extension* extension, - chrome::ViewType render_view_type, + extensions::ViewType render_view_type, webkit_glue::WebPreferences* webkit_prefs) { if (!extension) return; @@ -30,7 +30,7 @@ void SetPreferences(const extensions::Extension* extension, // Disable gpu acceleration for extension background pages to avoid // unecessarily creating a compositor context for them. - if (render_view_type == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + if (render_view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { webkit_prefs->accelerated_compositing_enabled = false; webkit_prefs->force_compositing_mode = false; } diff --git a/chrome/browser/extensions/extension_webkit_preferences.h b/chrome/browser/extensions/extension_webkit_preferences.h index 2136bc2..8af37dc 100644 --- a/chrome/browser/extensions/extension_webkit_preferences.h +++ b/chrome/browser/extensions/extension_webkit_preferences.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBKIT_PREFERENCES_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WEBKIT_PREFERENCES_H_ -#include "chrome/common/view_type.h" +#include "extensions/common/view_type.h" namespace extensions { class Extension; @@ -18,7 +18,7 @@ struct WebPreferences; namespace extension_webkit_preferences { void SetPreferences(const extensions::Extension* extension, - chrome::ViewType render_view_type, + extensions::ViewType render_view_type, webkit_glue::WebPreferences* webkit_prefs); } // namespace extension_webkit_preferences diff --git a/chrome/browser/extensions/lazy_background_task_queue.cc b/chrome/browser/extensions/lazy_background_task_queue.cc index 6354cfd..7215ff9 100644 --- a/chrome/browser/extensions/lazy_background_task_queue.cc +++ b/chrome/browser/extensions/lazy_background_task_queue.cc @@ -15,12 +15,12 @@ #include "chrome/common/extensions/background_info.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/view_type.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/view_type.h" namespace extensions { @@ -41,7 +41,7 @@ bool LazyBackgroundTaskQueue::ShouldEnqueueTask( Profile* profile, const Extension* extension) { DCHECK(extension); if (BackgroundInfo::HasBackgroundPage(extension)) { - ExtensionProcessManager* pm = extensions::ExtensionSystem::Get(profile)-> + ExtensionProcessManager* pm = ExtensionSystem::Get(profile)-> process_manager(); ExtensionHost* background_host = pm->GetBackgroundHostForExtension(extension->id()); @@ -128,8 +128,7 @@ void LazyBackgroundTaskQueue::Observe( // events for it. ExtensionHost* host = content::Details<ExtensionHost>(details).ptr(); - if (host->extension_host_type() == - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + if (host->extension_host_type() == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { CHECK(host->did_stop_loading()); ProcessPendingTasks(host, host->profile(), host->extension()); } @@ -143,8 +142,7 @@ void LazyBackgroundTaskQueue::Observe( Profile* profile = content::Source<Profile>(source).ptr(); ExtensionHost* host = content::Details<ExtensionHost>(details).ptr(); - if (host->extension_host_type() == - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { + if (host->extension_host_type() == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { ProcessPendingTasks(NULL, profile, host->extension()); } break; diff --git a/chrome/browser/extensions/message_handler.cc b/chrome/browser/extensions/message_handler.cc index 5a21dcb..6684a5f 100644 --- a/chrome/browser/extensions/message_handler.cc +++ b/chrome/browser/extensions/message_handler.cc @@ -7,11 +7,11 @@ #include "chrome/browser/extensions/api/messaging/message_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" using content::WebContents; @@ -39,7 +39,7 @@ void MessageHandler::RenderViewHostInitialized() { WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host()); Send(new ExtensionMsg_NotifyRenderViewType( - routing_id(), chrome::GetViewType(web_contents))); + routing_id(), extensions::GetViewType(web_contents))); } void MessageHandler::OnPostMessage(int port_id, diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 450adc8..4bdb839 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -19,11 +19,11 @@ #include "chrome/browser/geolocation/geolocation_permission_request_id.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" @@ -86,7 +86,8 @@ void ChromeGeolocationPermissionContext::RequestGeolocationPermission( } } - if (chrome::GetViewType(web_contents) != chrome::VIEW_TYPE_TAB_CONTENTS) { + if (extensions::GetViewType(web_contents) != + extensions::VIEW_TYPE_TAB_CONTENTS) { // The tab may have gone away, or the request may not be from a tab at all. // TODO(mpcomplete): the request could be from a background page or // extension popup (web_contents will have a different ViewType). But why do diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index 1baef2b..400269c 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_service.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" @@ -30,6 +29,7 @@ #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_renderer_host.h" #include "content/public/test/web_contents_tester.h" +#include "extensions/browser/view_type_utils.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_ANDROID) @@ -230,7 +230,7 @@ void GeolocationPermissionContextTests::AddNewTab(const GURL& url) { SendNavigate(extra_tabs_.size() + 1, url); // Set up required helpers, and make this be as "tabby" as the code requires. - chrome::SetViewType(new_tab, chrome::VIEW_TYPE_TAB_CONTENTS); + extensions::SetViewType(new_tab, extensions::VIEW_TYPE_TAB_CONTENTS); InfoBarService::CreateForWebContents(new_tab); extra_tabs_.push_back(new_tab); @@ -257,7 +257,7 @@ void GeolocationPermissionContextTests::SetUp() { ChromeRenderViewHostTestHarness::SetUp(); // Set up required helpers, and make this be as "tabby" as the code requires. - chrome::SetViewType(web_contents(), chrome::VIEW_TYPE_TAB_CONTENTS); + extensions::SetViewType(web_contents(), extensions::VIEW_TYPE_TAB_CONTENTS); InfoBarService::CreateForWebContents(web_contents()); TabSpecificContentSettings::CreateForWebContents(web_contents()); #if defined(OS_ANDROID) diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index f385e9d..3571453 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_process_type.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" @@ -27,6 +26,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/bindings_policy.h" +#include "extensions/browser/view_type_utils.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -252,7 +252,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { GURL url; if (contents) url = contents->GetURL(); - chrome::ViewType type = chrome::GetViewType(contents); + extensions::ViewType type = extensions::GetViewType(contents); if (host->GetEnabledBindings() & content::BINDINGS_POLICY_WEB_UI) { process.renderer_type = ProcessMemoryInformation::RENDERER_CHROME; } else if (extension_process_map && @@ -292,14 +292,14 @@ void MemoryDetails::CollectChildInfoOnUIThread() { continue; } - if (type == chrome::VIEW_TYPE_BACKGROUND_CONTENTS) { + if (type == extensions::VIEW_TYPE_BACKGROUND_CONTENTS) { process.titles.push_back(UTF8ToUTF16(url.spec())); process.renderer_type = ProcessMemoryInformation::RENDERER_BACKGROUND_APP; continue; } - if (type == chrome::VIEW_TYPE_NOTIFICATION) { + if (type == extensions::VIEW_TYPE_NOTIFICATION) { process.titles.push_back(UTF8ToUTF16(url.spec())); process.renderer_type = ProcessMemoryInformation::RENDERER_NOTIFICATION; diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index 4fd5f65..c24bef6 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -14,7 +14,6 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" @@ -28,6 +27,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/renderer_preferences.h" +#include "extensions/browser/view_type_utils.h" #include "ipc/ipc_message.h" using content::SiteInstance; @@ -139,7 +139,8 @@ void BalloonHost::Init() { DCHECK(!web_contents_.get()) << "BalloonViewHost already initialized."; web_contents_.reset(WebContents::Create( WebContents::CreateParams(balloon_->profile(), site_instance_.get()))); - chrome::SetViewType(web_contents_.get(), chrome::VIEW_TYPE_NOTIFICATION); + extensions::SetViewType( + web_contents_.get(), extensions::VIEW_TYPE_NOTIFICATION); web_contents_->SetDelegate(this); Observe(web_contents_.get()); renderer_preferences_util::UpdateFromSystemSettings( diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc index 05b435d..b09d38f 100644 --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc @@ -17,7 +17,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/speech/chrome_speech_recognition_preferences.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" @@ -32,6 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/speech_recognition_error.h" #include "content/public/common/speech_recognition_result.h" +#include "extensions/browser/view_type_utils.h" #include "grit/generated_resources.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/l10n/l10n_util.h" @@ -501,15 +501,15 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType( } WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host); - chrome::ViewType view_type = chrome::GetViewType(web_contents); + extensions::ViewType view_type = extensions::GetViewType(web_contents); // TODO(kalman): Also enable speech bubble for extension popups // (VIEW_TYPE_EXTENSION_POPUP) once popup-like control UI works properly in // extensions: http://crbug.com/163851. // Right now the extension popup closes and dismisses immediately on user // click. - if (view_type == chrome::VIEW_TYPE_TAB_CONTENTS || - view_type == chrome::VIEW_TYPE_APP_SHELL) { + if (view_type == extensions::VIEW_TYPE_TAB_CONTENTS || + view_type == extensions::VIEW_TYPE_APP_SHELL) { // If it is a tab, we can show the speech input bubble or ask for // permission. diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc index f98a812..5f40758 100644 --- a/chrome/browser/tab_contents/background_contents.cc +++ b/chrome/browser/tab_contents/background_contents.cc @@ -8,7 +8,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" @@ -16,6 +15,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #include "ui/gfx/rect.h" using content::SiteInstance; @@ -32,8 +32,8 @@ BackgroundContents::BackgroundContents(SiteInstance* site_instance, WebContents::CreateParams create_params(profile_, site_instance); create_params.routing_id = routing_id; web_contents_.reset(WebContents::Create(create_params)); - chrome::SetViewType( - web_contents_.get(), chrome::VIEW_TYPE_BACKGROUND_CONTENTS); + extensions::SetViewType( + web_contents_.get(), extensions::VIEW_TYPE_BACKGROUND_CONTENTS); web_contents_->SetDelegate(this); content::WebContentsObserver::Observe(web_contents_.get()); diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 5a4fcc7..4b535e6 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -55,7 +55,6 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" #include "chrome/browser/ui/tab_contents/core_tab_helper.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -79,6 +78,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_restriction.h" #include "content/public/common/ssl_status.h" +#include "extensions/browser/view_type_utils.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" @@ -412,14 +412,15 @@ void RenderViewContextMenu::InitMenu() { return; } - chrome::ViewType view_type = chrome::GetViewType(source_web_contents_); - if (view_type == chrome::VIEW_TYPE_APP_SHELL) { + extensions::ViewType view_type = + extensions::GetViewType(source_web_contents_); + if (view_type == extensions::VIEW_TYPE_APP_SHELL) { AppendPlatformAppItems(); return; - } else if (view_type == chrome::VIEW_TYPE_EXTENSION_POPUP) { + } else if (view_type == extensions::VIEW_TYPE_EXTENSION_POPUP) { AppendPopupExtensionItems(); return; - } else if (view_type == chrome::VIEW_TYPE_PANEL) { + } else if (view_type == extensions::VIEW_TYPE_PANEL) { AppendPanelItems(); return; } diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 0f96277..fea26bc 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -30,7 +30,6 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "chrome/common/view_type.h" #include "content/public/browser/browser_child_process_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/gpu_data_manager.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 26ebd07..ac07f7b 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -43,7 +43,6 @@ #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_manager.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_process_type.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -59,6 +58,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/common/process_type.h" +#include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -749,7 +749,7 @@ void TaskManagerPanelResourceProvider::Observe(int type, const content::NotificationSource& source, const content::NotificationDetails& details) { WebContents* web_contents = content::Source<WebContents>(source).ptr(); - if (chrome::GetViewType(web_contents) != chrome::VIEW_TYPE_PANEL) + if (extensions::GetViewType(web_contents) != extensions::VIEW_TYPE_PANEL) return; switch (type) { @@ -1409,8 +1409,8 @@ const Extension* TaskManagerExtensionProcessResource::GetExtension() const { bool TaskManagerExtensionProcessResource::IsBackground() const { WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host_); - chrome::ViewType view_type = chrome::GetViewType(web_contents); - return view_type == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; + extensions::ViewType view_type = extensions::GetViewType(web_contents); + return view_type == extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; } //////////////////////////////////////////////////////////////////////////////// @@ -1545,17 +1545,17 @@ bool TaskManagerExtensionProcessResourceProvider:: // TaskManagerExtensionProcessResource constructor). if (web_contents->GetRenderProcessHost()->IsGuest()) return false; - chrome::ViewType view_type = chrome::GetViewType(web_contents); + extensions::ViewType view_type = extensions::GetViewType(web_contents); // Don't add WebContents (those are handled by // TaskManagerTabContentsResourceProvider) or background contents (handled // by TaskManagerBackgroundResourceProvider). #if defined(USE_ASH) - return (view_type != chrome::VIEW_TYPE_TAB_CONTENTS && - view_type != chrome::VIEW_TYPE_BACKGROUND_CONTENTS); + return (view_type != extensions::VIEW_TYPE_TAB_CONTENTS && + view_type != extensions::VIEW_TYPE_BACKGROUND_CONTENTS); #else - return (view_type != chrome::VIEW_TYPE_TAB_CONTENTS && - view_type != chrome::VIEW_TYPE_BACKGROUND_CONTENTS && - view_type != chrome::VIEW_TYPE_PANEL); + return (view_type != extensions::VIEW_TYPE_TAB_CONTENTS && + view_type != extensions::VIEW_TYPE_BACKGROUND_CONTENTS && + view_type != extensions::VIEW_TYPE_PANEL); #endif // USE_ASH } diff --git a/chrome/browser/ui/browser_tab_contents.cc b/chrome/browser/ui/browser_tab_contents.cc index 28b06f4..0300bf2 100644 --- a/chrome/browser/ui/browser_tab_contents.cc +++ b/chrome/browser/ui/browser_tab_contents.cc @@ -42,11 +42,11 @@ #include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" #include "chrome/browser/ui/zoom/zoom_controller.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_switches.h" #include "components/autofill/browser/autofill_external_delegate.h" #include "components/autofill/browser/autofill_manager.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #if defined(ENABLE_AUTOMATION) #include "chrome/browser/automation/automation_tab_helper.h" @@ -91,7 +91,7 @@ void BrowserTabContents::AttachTabHelpers(WebContents* web_contents) { new base::SupportsUserData::Data()); // Set the view type. - chrome::SetViewType(web_contents, chrome::VIEW_TYPE_TAB_CONTENTS); + extensions::SetViewType(web_contents, extensions::VIEW_TYPE_TAB_CONTENTS); // Create all the tab helpers. diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm index 477a820..2d96538 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.mm @@ -7,11 +7,11 @@ #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/common/view_type.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/view_type.h" // The minimum/maximum dimensions of the popup. const CGFloat ExtensionViewMac::kMinWidth = 25.0; @@ -53,8 +53,8 @@ void ExtensionViewMac::ResizeDueToAutoResize(const gfx::Size& new_size) { } void ExtensionViewMac::RenderViewCreated() { - chrome::ViewType host_type = extension_host_->extension_host_type(); - if (host_type == chrome::VIEW_TYPE_EXTENSION_POPUP) { + extensions::ViewType host_type = extension_host_->extension_host_type(); + if (host_type == extensions::VIEW_TYPE_EXTENSION_POPUP) { gfx::Size min_size(ExtensionViewMac::kMinWidth, ExtensionViewMac::kMinHeight); gfx::Size max_size(ExtensionViewMac::kMaxWidth, diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc index 770e4f7..dec6c73 100644 --- a/chrome/browser/ui/extensions/shell_window.cc +++ b/chrome/browser/ui/extensions/shell_window.cc @@ -25,7 +25,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/native_app_window.h" #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/api/icons/icons_handler.h" #include "chrome/common/extensions/extension.h" @@ -42,6 +41,7 @@ #include "content/public/browser/resource_dispatcher_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/media_stream_request.h" +#include "extensions/browser/view_type_utils.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/image/image_skia.h" @@ -109,7 +109,7 @@ void ShellWindow::Init(const GURL& url, FaviconTabHelper::CreateForWebContents(web_contents); web_contents->SetDelegate(this); - chrome::SetViewType(web_contents, chrome::VIEW_TYPE_APP_SHELL); + extensions::SetViewType(web_contents, extensions::VIEW_TYPE_APP_SHELL); // Initialize the window window_type_ = params.window_type; diff --git a/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc index 5b2cf1d..06e6d6d 100644 --- a/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_view_gtk.cc @@ -6,11 +6,11 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h" -#include "chrome/common/view_type.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/view_type.h" ExtensionViewGtk::ExtensionViewGtk(extensions::ExtensionHost* extension_host, Browser* browser) @@ -54,8 +54,8 @@ void ExtensionViewGtk::RenderViewCreated() { pending_background_.reset(); } - chrome::ViewType host_type = extension_host_->extension_host_type(); - if (host_type == chrome::VIEW_TYPE_EXTENSION_POPUP) { + extensions::ViewType host_type = extension_host_->extension_host_type(); + if (host_type == extensions::VIEW_TYPE_EXTENSION_POPUP) { gfx::Size min_size(ExtensionPopupGtk::kMinWidth, ExtensionPopupGtk::kMinHeight); gfx::Size max_size(ExtensionPopupGtk::kMaxWidth, diff --git a/chrome/browser/ui/panels/panel_host.cc b/chrome/browser/ui/panels/panel_host.cc index fb13e4c5..3044c2bd 100644 --- a/chrome/browser/ui/panels/panel_host.cc +++ b/chrome/browser/ui/panels/panel_host.cc @@ -15,7 +15,6 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/invalidate_type.h" @@ -27,6 +26,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/view_type_utils.h" #include "ui/gfx/image/image.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" @@ -52,7 +52,7 @@ void PanelHost::Init(const GURL& url) { content::WebContents::CreateParams create_params( profile_, content::SiteInstance::CreateForURL(profile_, url)); web_contents_.reset(content::WebContents::Create(create_params)); - chrome::SetViewType(web_contents_.get(), chrome::VIEW_TYPE_PANEL); + extensions::SetViewType(web_contents_.get(), extensions::VIEW_TYPE_PANEL); web_contents_->SetDelegate(this); content::WebContentsObserver::Observe(web_contents_.get()); diff --git a/chrome/browser/ui/views/extensions/extension_view_views.cc b/chrome/browser/ui/views/extensions/extension_view_views.cc index 7f58ae1..1d8d8f0 100644 --- a/chrome/browser/ui/views/extensions/extension_view_views.cc +++ b/chrome/browser/ui/views/extensions/extension_view_views.cc @@ -6,12 +6,12 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/ui/views/extensions/extension_popup.h" -#include "chrome/common/view_type.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/view_type.h" #include "ui/base/events/event.h" #include "ui/views/widget/widget.h" @@ -150,8 +150,8 @@ void ExtensionViewViews::OnBoundsChanged(const gfx::Rect& previous_bounds) { } void ExtensionViewViews::RenderViewCreated() { - chrome::ViewType host_type = host_->extension_host_type(); - if (host_type == chrome::VIEW_TYPE_EXTENSION_POPUP) { + extensions::ViewType host_type = host_->extension_host_type(); + if (host_type == extensions::VIEW_TYPE_EXTENSION_POPUP) { gfx::Size min_size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight); gfx::Size max_size(ExtensionPopup::kMaxWidth, diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 5ce90be..79e9c00 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -41,7 +41,6 @@ #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" -#include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/background_info.h" @@ -65,6 +64,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -1018,10 +1018,10 @@ void ExtensionSettingsHandler::GetInspectablePagesForExtensionProcess( iter != views.end(); ++iter) { RenderViewHost* host = *iter; WebContents* web_contents = WebContents::FromRenderViewHost(host); - chrome::ViewType host_type = chrome::GetViewType(web_contents); + extensions::ViewType host_type = extensions::GetViewType(web_contents); if (host == deleting_rvh_ || - chrome::VIEW_TYPE_EXTENSION_POPUP == host_type || - chrome::VIEW_TYPE_EXTENSION_DIALOG == host_type) + extensions::VIEW_TYPE_EXTENSION_POPUP == host_type || + extensions::VIEW_TYPE_EXTENSION_DIALOG == host_type) continue; GURL url = web_contents->GetURL(); diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index c310e27..8b22563 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2076,8 +2076,6 @@ 'browser/value_store/value_store_frontend.h', 'browser/value_store/value_store.cc', 'browser/value_store/value_store.h', - 'browser/view_type_utils.cc', - 'browser/view_type_utils.h', 'browser/web_applications/web_app.cc', 'browser/web_applications/web_app.h', 'browser/web_applications/web_app_android.cc', diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index 320f863..fc3c016 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -57,6 +57,8 @@ # tests and mocks. '../extensions/browser/file_reader.cc', '../extensions/browser/file_reader.h', + '../extensions/browser/view_type_utils.cc', + '../extensions/browser/view_type_utils.h', 'browser/extensions/active_tab_permission_granter.cc', 'browser/extensions/active_tab_permission_granter.h', 'browser/extensions/activity_actions.h', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 4bfaa77..988b23e 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -94,6 +94,8 @@ '../extensions/common/url_pattern.h', '../extensions/common/url_pattern_set.cc', '../extensions/common/url_pattern_set.h', + '../extensions/common/view_type.cc', + '../extensions/common/view_type.h', 'common/all_messages.h', 'common/attrition_experiments.h', 'common/auto_start_linux.cc', @@ -399,8 +401,6 @@ 'common/time_format.h', 'common/url_constants.cc', 'common/url_constants.h', - 'common/view_type.cc', - 'common/view_type.h', 'common/web_apps.cc', 'common/web_apps.h', 'common/web_resource/web_resource_unpacker.cc', diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h index 431b2a1..32c24b3 100644 --- a/chrome/common/extensions/extension_messages.h +++ b/chrome/common/extensions/extension_messages.h @@ -16,19 +16,19 @@ #include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/permissions/socket_permission_data.h" #include "chrome/common/extensions/permissions/usb_device_permission_data.h" -#include "chrome/common/view_type.h" #include "chrome/common/web_apps.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/socket_permission_request.h" #include "extensions/common/draggable_region.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" +#include "extensions/common/view_type.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #define IPC_MESSAGE_START ExtensionMsgStart -IPC_ENUM_TRAITS(chrome::ViewType) +IPC_ENUM_TRAITS(extensions::ViewType) // Parameters structure for ExtensionHostMsg_AddAPIActionToActivityLog. IPC_STRUCT_BEGIN(ExtensionHostMsg_APIAction_Params) @@ -357,7 +357,7 @@ IPC_MESSAGE_CONTROL2(ExtensionMsg_ClearTabSpecificPermissions, // Tell the renderer which type this view is. IPC_MESSAGE_ROUTED1(ExtensionMsg_NotifyRenderViewType, - chrome::ViewType /* view_type */) + extensions::ViewType /* view_type */) // Deliver a message sent with ExtensionHostMsg_PostMessage. IPC_MESSAGE_CONTROL3(ExtensionMsg_UsingWebRequestAPI, diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index 73bcd4b..1016fc6 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -21,7 +21,6 @@ #include "chrome/common/extensions/message_bundle.h" #include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/url_constants.h" -#include "chrome/common/view_type.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/api_activity_logger.h" #include "chrome/renderer/extensions/api_definitions_natives.h" @@ -62,8 +61,8 @@ #include "chrome/renderer/resource_bundle_source_map.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/view_type.h" #include "grit/renderer_resources.h" - #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" @@ -253,7 +252,7 @@ class LazyBackgroundPageNativeHandler : public ChromeV8Extension { ExtensionHelper* helper = ExtensionHelper::Get(render_view); return (extension && BackgroundInfo::HasLazyBackgroundPage(extension) && - helper->view_type() == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); + helper->view_type() == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); } }; @@ -504,7 +503,7 @@ void Dispatcher::OnSetFunctionNames( } void Dispatcher::OnSetChannel(int channel) { - extensions::Feature::SetCurrentChannel( + Feature::SetCurrentChannel( static_cast<chrome::VersionInfo::Channel>(channel)); } diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 7f90a17..2b8421e3 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -17,7 +17,6 @@ #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/value_counter.h" #include "chrome/common/url_constants.h" -#include "chrome/common/view_type.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/chrome_v8_context_set.h" #include "chrome/renderer/extensions/chrome_v8_extension.h" @@ -28,6 +27,7 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/v8_value_converter.h" #include "extensions/common/event_filter.h" +#include "extensions/common/view_type.h" #include "googleurl/src/gurl.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" @@ -319,7 +319,7 @@ class ExtensionImpl : public ChromeV8Extension { return false; ExtensionHelper* helper = ExtensionHelper::Get(render_view); return (extension && BackgroundInfo::HasLazyBackgroundPage(extension) && - helper->view_type() == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); + helper->view_type() == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); } static scoped_ptr<EventMatcher> ParseEventMatcher( diff --git a/chrome/renderer/extensions/extension_custom_bindings.cc b/chrome/renderer/extensions/extension_custom_bindings.cc index 81680de..7f6c6c2 100644 --- a/chrome/renderer/extensions/extension_custom_bindings.cc +++ b/chrome/renderer/extensions/extension_custom_bindings.cc @@ -10,11 +10,11 @@ #include "base/string_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" -#include "chrome/common/view_type.h" #include "chrome/renderer/extensions/dispatcher.h" #include "chrome/renderer/extensions/extension_helper.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/view_type.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" @@ -50,26 +50,26 @@ v8::Handle<v8::Value> ExtensionCustomBindings::GetExtensionViews( std::string view_type_string = *v8::String::Utf8Value(args[1]->ToString()); StringToUpperASCII(&view_type_string); - // |view_type| == chrome::VIEW_TYPE_INVALID means getting any type of + // |view_type| == VIEW_TYPE_INVALID means getting any type of // views. - chrome::ViewType view_type = chrome::VIEW_TYPE_INVALID; - if (view_type_string == chrome::kViewTypeBackgroundPage) { - view_type = chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; - } else if (view_type_string == chrome::kViewTypeInfobar) { - view_type = chrome::VIEW_TYPE_EXTENSION_INFOBAR; - } else if (view_type_string == chrome::kViewTypeNotification) { - view_type = chrome::VIEW_TYPE_NOTIFICATION; - } else if (view_type_string == chrome::kViewTypeTabContents) { - view_type = chrome::VIEW_TYPE_TAB_CONTENTS; - } else if (view_type_string == chrome::kViewTypePopup) { - view_type = chrome::VIEW_TYPE_EXTENSION_POPUP; - } else if (view_type_string == chrome::kViewTypeExtensionDialog) { - view_type = chrome::VIEW_TYPE_EXTENSION_DIALOG; - } else if (view_type_string == chrome::kViewTypeAppShell) { - view_type = chrome::VIEW_TYPE_APP_SHELL; - } else if (view_type_string == chrome::kViewTypePanel) { - view_type = chrome::VIEW_TYPE_PANEL; - } else if (view_type_string != chrome::kViewTypeAll) { + ViewType view_type = VIEW_TYPE_INVALID; + if (view_type_string == kViewTypeBackgroundPage) { + view_type = VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; + } else if (view_type_string == kViewTypeInfobar) { + view_type = VIEW_TYPE_EXTENSION_INFOBAR; + } else if (view_type_string == kViewTypeNotification) { + view_type = VIEW_TYPE_NOTIFICATION; + } else if (view_type_string == kViewTypeTabContents) { + view_type = VIEW_TYPE_TAB_CONTENTS; + } else if (view_type_string == kViewTypePopup) { + view_type = VIEW_TYPE_EXTENSION_POPUP; + } else if (view_type_string == kViewTypeExtensionDialog) { + view_type = VIEW_TYPE_EXTENSION_DIALOG; + } else if (view_type_string == kViewTypeAppShell) { + view_type = VIEW_TYPE_APP_SHELL; + } else if (view_type_string == kViewTypePanel) { + view_type = VIEW_TYPE_PANEL; + } else if (view_type_string != kViewTypeAll) { return v8::Undefined(); } diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index 15152ee..a488cb7 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -15,7 +15,6 @@ #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" -#include "chrome/common/view_type.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/console.h" #include "chrome/renderer/extensions/dispatcher.h" @@ -67,7 +66,7 @@ class ViewAccumulator : public content::RenderViewVisitor { public: ViewAccumulator(const std::string& extension_id, int browser_window_id, - chrome::ViewType view_type) + ViewType view_type) : extension_id_(extension_id), browser_window_id_(browser_window_id), view_type_(view_type) { @@ -82,7 +81,7 @@ class ViewAccumulator : public content::RenderViewVisitor { return true; GURL url = render_view->GetWebView()->mainFrame()->document().url(); - if (!url.SchemeIs(extensions::kExtensionScheme)) + if (!url.SchemeIs(kExtensionScheme)) return true; const std::string& extension_id = url.host(); if (extension_id != extension_id_) @@ -95,19 +94,19 @@ class ViewAccumulator : public content::RenderViewVisitor { views_.push_back(render_view); - if (view_type_ == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) + if (view_type_ == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) return false; // There can be only one... return true; } private: // Returns true if |type| "isa" |match|. - static bool ViewTypeMatches(chrome::ViewType type, chrome::ViewType match) { + static bool ViewTypeMatches(ViewType type, ViewType match) { if (type == match) return true; // INVALID means match all. - if (match == chrome::VIEW_TYPE_INVALID) + if (match == VIEW_TYPE_INVALID) return true; return false; @@ -115,7 +114,7 @@ class ViewAccumulator : public content::RenderViewVisitor { std::string extension_id_; int browser_window_id_; - chrome::ViewType view_type_; + ViewType view_type_; std::vector<content::RenderView*> views_; }; @@ -125,7 +124,7 @@ class ViewAccumulator : public content::RenderViewVisitor { std::vector<content::RenderView*> ExtensionHelper::GetExtensionViews( const std::string& extension_id, int browser_window_id, - chrome::ViewType view_type) { + ViewType view_type) { ViewAccumulator accumulator(extension_id, browser_window_id, view_type); content::RenderView::ForEach(&accumulator); return accumulator.views(); @@ -135,7 +134,7 @@ std::vector<content::RenderView*> ExtensionHelper::GetExtensionViews( content::RenderView* ExtensionHelper::GetBackgroundPage( const std::string& extension_id) { ViewAccumulator accumulator(extension_id, extension_misc::kUnknownWindowId, - chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); + VIEW_TYPE_EXTENSION_BACKGROUND_PAGE); content::RenderView::ForEach(&accumulator); CHECK_LE(accumulator.views().size(), 1u); if (accumulator.views().size() == 0) @@ -149,7 +148,7 @@ ExtensionHelper::ExtensionHelper(content::RenderView* render_view, content::RenderViewObserverTracker<ExtensionHelper>(render_view), dispatcher_(dispatcher), pending_app_icon_requests_(0), - view_type_(chrome::VIEW_TYPE_INVALID), + view_type_(VIEW_TYPE_INVALID), tab_id_(-1), browser_window_id_(-1) { } @@ -217,9 +216,9 @@ void ExtensionHelper::DidStartProvisionalLoad(WebKit::WebFrame* frame) { void ExtensionHelper::DraggableRegionsChanged(WebKit::WebFrame* frame) { WebKit::WebVector<WebKit::WebDraggableRegion> webregions = frame->document().draggableRegions(); - std::vector<extensions::DraggableRegion> regions; + std::vector<DraggableRegion> regions; for (size_t i = 0; i < webregions.size(); ++i) { - extensions::DraggableRegion region; + DraggableRegion region; region.bounds = webregions[i].bounds; region.draggable = webregions[i].draggable; regions.push_back(region); @@ -349,7 +348,7 @@ void ExtensionHelper::OnGetApplicationInfo(int page_id) { routing_id(), page_id, app_info)); } -void ExtensionHelper::OnNotifyRendererViewType(chrome::ViewType type) { +void ExtensionHelper::OnNotifyRendererViewType(ViewType type) { view_type_ = type; } diff --git a/chrome/renderer/extensions/extension_helper.h b/chrome/renderer/extensions/extension_helper.h index d9a303e..8d8620c 100644 --- a/chrome/renderer/extensions/extension_helper.h +++ b/chrome/renderer/extensions/extension_helper.h @@ -10,10 +10,10 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/view_type.h" #include "content/public/common/console_message_level.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer_tracker.h" +#include "extensions/common/view_type.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" class GURL; @@ -44,7 +44,7 @@ class ExtensionHelper static std::vector<content::RenderView*> GetExtensionViews( const std::string& extension_id, int browser_window_id, - chrome::ViewType view_type); + ViewType view_type); // Returns the given extension's background page, or NULL if none. static content::RenderView* GetBackgroundPage( @@ -55,7 +55,7 @@ class ExtensionHelper int tab_id() const { return tab_id_; } int browser_window_id() const { return browser_window_id_; } - chrome::ViewType view_type() const { return view_type_; } + ViewType view_type() const { return view_type_; } Dispatcher* dispatcher() const { return dispatcher_; } private: @@ -89,7 +89,7 @@ class ExtensionHelper const std::string& error_message); void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params); void OnGetApplicationInfo(int page_id); - void OnNotifyRendererViewType(chrome::ViewType view_type); + void OnNotifyRendererViewType(ViewType view_type); void OnSetTabId(int tab_id); void OnUpdateBrowserWindowId(int window_id); void OnAddMessageToConsole(content::ConsoleMessageLevel level, @@ -116,7 +116,7 @@ class ExtensionHelper int pending_app_icon_requests_; // Type of view attached with RenderView. - chrome::ViewType view_type_; + ViewType view_type_; // Id of the tab which the RenderView is attached to. int tab_id_; diff --git a/chrome/browser/view_type_utils.cc b/extensions/browser/view_type_utils.cc index d24e9cf..a28381f 100644 --- a/chrome/browser/view_type_utils.cc +++ b/extensions/browser/view_type_utils.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/view_type_utils.h" +#include "extensions/browser/view_type_utils.h" #include "base/lazy_instance.h" #include "content/public/browser/web_contents.h" using content::WebContents; -namespace chrome { +namespace extensions { namespace { @@ -38,8 +38,7 @@ ViewType GetViewType(WebContents* tab) { } void SetViewType(WebContents* tab, ViewType type) { - tab->SetUserData(&kViewTypeUserDataKey, - new ViewTypeUserData(type)); + tab->SetUserData(&kViewTypeUserDataKey, new ViewTypeUserData(type)); } } // namespace chrome diff --git a/chrome/browser/view_type_utils.h b/extensions/browser/view_type_utils.h index 7407f47..4667be4 100644 --- a/chrome/browser/view_type_utils.h +++ b/extensions/browser/view_type_utils.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_VIEW_TYPE_UTILS_H_ -#define CHROME_BROWSER_VIEW_TYPE_UTILS_H_ +#ifndef EXTENSIONS_BROWSER_VIEW_TYPE_UTILS_H_ +#define EXTENSIONS_BROWSER_VIEW_TYPE_UTILS_H_ -#include "chrome/common/view_type.h" +#include "extensions/common/view_type.h" namespace content { class WebContents; } -namespace chrome { +namespace extensions { // Get/Set the type of a WebContents. // GetViewType handles a NULL |tab| for convenience by returning @@ -21,4 +21,4 @@ void SetViewType(content::WebContents* tab, ViewType type); } // namespace chrome -#endif // CHROME_BROWSER_VIEW_TYPE_UTILS_H_ +#endif // EXTENSIONS_BROWSER_VIEW_TYPE_UTILS_H_ diff --git a/chrome/common/view_type.cc b/extensions/common/view_type.cc index 5824b4c..679532a 100644 --- a/chrome/common/view_type.cc +++ b/extensions/common/view_type.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/view_type.h" +#include "extensions/common/view_type.h" -namespace chrome { +namespace extensions { const char kViewTypeTabContents[] = "TAB"; const char kViewTypeBackgroundPage[] = "BACKGROUND"; @@ -16,4 +16,4 @@ const char kViewTypeExtensionDialog[] = "EXTENSION_DIALOG"; const char kViewTypeAppShell[] = "SHELL"; const char kViewTypeAll[] = "ALL"; -} // namespace chrome +} // namespace extensions diff --git a/chrome/common/view_type.h b/extensions/common/view_type.h index c7f303a..690ecab 100644 --- a/chrome/common/view_type.h +++ b/extensions/common/view_type.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_VIEW_TYPE_H_ -#define CHROME_COMMON_VIEW_TYPE_H_ +#ifndef EXTENSIONS_COMMON_VIEW_TYPE_H_ +#define EXTENSIONS_COMMON_VIEW_TYPE_H_ -namespace chrome { +namespace extensions { // Icky RTTI used by a few systems to distinguish the host type of a given -// RenderViewHost or WebContents. +// WebContents. // // TODO(aa): Remove this and teach those systems to keep track of their own // data. @@ -20,6 +20,8 @@ enum ViewType { VIEW_TYPE_EXTENSION_DIALOG, VIEW_TYPE_EXTENSION_INFOBAR, VIEW_TYPE_EXTENSION_POPUP, + // TODO(jam): remove this once http://crbug.com/137297 is fixed and HTML5 + // notifications don't use WebContents. VIEW_TYPE_NOTIFICATION, VIEW_TYPE_PANEL, VIEW_TYPE_TAB_CONTENTS, @@ -37,6 +39,6 @@ extern const char kViewTypePanel[]; extern const char kViewTypePopup[]; extern const char kViewTypeTabContents[]; -} // namespace chrome +} // namespace extensions -#endif // CHROME_COMMON_VIEW_TYPE_H_ +#endif // EXTENSIONS_COMMON_VIEW_TYPE_H_ |