From 2accabecaa9144edef9a7495eb1783feee255021 Mon Sep 17 00:00:00 2001 From: "hashimoto@chromium.org" Date: Wed, 20 Aug 2014 07:48:29 +0000 Subject: [PATCH] Move NativeAppWindow to extensions Move native_app_window.h from apps/ui to extensions/browser/app_window. Change the namespace from apps to extensions. Add dependency on components/web_modal to extensions/browser. BUG=403726 TBR=sky@chromium.org for include fix under chrome/browser Review URL: https://codereview.chromium.org/479933003 Cr-Commit-Position: refs/heads/master@{#290786} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290786 0039d316-1c4b-4281-b951-d872f2087c98 --- .../app_shim_interactive_uitest_mac.mm | 2 +- .../extension_app_shim_handler_mac.cc | 2 +- apps/app_window.cc | 3 ++- apps/app_window.h | 9 +++---- apps/app_window_browsertest.cc | 3 ++- apps/app_window_contents.cc | 6 ++--- apps/app_window_contents.h | 3 ++- apps/app_window_interactive_uitest.cc | 2 +- apps/app_window_registry.cc | 2 +- apps/apps.gypi | 1 - apps/ui/apps_client.h | 7 +++--- apps/ui/views/app_window_frame_view.cc | 4 ++-- apps/ui/views/app_window_frame_view.h | 10 ++++---- apps/ui/views/native_app_window_views.h | 5 ++-- chrome/browser/apps/app_browsertest.cc | 2 +- chrome/browser/apps/app_browsertest_util.cc | 2 +- .../apps/app_window_interactive_uitest.cc | 4 ++-- chrome/browser/apps/web_view_browsertest.cc | 2 +- .../chromeos/login/kiosk_browsertest.cc | 2 +- .../device_local_account_browsertest.cc | 3 ++- .../app_current_window_internal_api.cc | 2 +- .../api/app_window/app_window_api.cc | 2 +- .../api/app_window/app_window_apitest.cc | 2 +- .../extensions/api/tabs/ash_panel_contents.cc | 4 ++-- .../extensions/api/tabs/ash_panel_contents.h | 4 ++-- chrome/browser/policy/policy_browsertest.cc | 2 +- chrome/browser/ui/apps/chrome_apps_client.cc | 2 +- chrome/browser/ui/apps/chrome_apps_client.h | 4 ++-- .../ash/accelerator_commands_browsertest.cc | 8 ++++--- .../chrome_new_window_delegate_chromeos.cc | 2 +- .../app_shortcut_launcher_item_controller.cc | 2 +- .../app_window_launcher_item_controller.cc | 2 +- .../chrome_launcher_controller_browsertest.cc | 2 +- .../chrome_launcher_controller_unittest.cc | 2 +- ..._profile_app_window_launcher_controller.cc | 2 +- .../autofill_dialog_controller_impl.cc | 2 +- ...pp_shim_menu_controller_mac_browsertest.mm | 2 +- .../ui/cocoa/apps/chrome_apps_client_cocoa.mm | 2 +- .../ui/cocoa/apps/native_app_window_cocoa.h | 5 ++-- .../native_app_window_cocoa_browsertest.mm | 6 ++--- .../apps/quit_with_apps_controller_mac.cc | 2 +- ..._apps_controller_mac_interactive_uitest.cc | 2 +- .../ui/views/apps/chrome_apps_client_views.cc | 2 +- .../apps/chrome_apps_client_views_win.cc | 2 +- .../apps/chrome_native_app_window_views.cc | 2 +- .../apps/chrome_native_app_window_views_win.h | 4 ++-- .../apps/glass_app_window_frame_view_win.cc | 4 ++-- .../apps/glass_app_window_frame_view_win.h | 6 ++--- .../shaped_app_window_targeter_unittest.cc | 2 +- .../ui/views/select_file_dialog_extension.cc | 2 +- extensions/browser/BUILD.gn | 2 ++ extensions/browser/DEPS | 1 + .../browser/app_window}/native_app_window.h | 24 ++++++++++++------- extensions/extensions.gyp | 2 ++ 54 files changed, 106 insertions(+), 84 deletions(-) rename {apps/ui => extensions/browser/app_window}/native_app_window.h (87%) diff --git a/apps/app_shim/app_shim_interactive_uitest_mac.mm b/apps/app_shim/app_shim_interactive_uitest_mac.mm index a51cc9bdc04c2b..f019c8e14c39f9 100644 --- a/apps/app_shim/app_shim_interactive_uitest_mac.mm +++ b/apps/app_shim/app_shim_interactive_uitest_mac.mm @@ -9,7 +9,6 @@ #include "apps/app_shim/app_shim_host_manager_mac.h" #include "apps/app_shim/extension_app_shim_handler_mac.h" #include "apps/switches.h" -#include "apps/ui/native_app_window.h" #include "base/auto_reset.h" #include "base/callback.h" #include "base/files/file_path_watcher.h" @@ -30,6 +29,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/mac/app_mode_common.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_registry.h" #import "ui/events/test/cocoa_test_event_utils.h" diff --git a/apps/app_shim/extension_app_shim_handler_mac.cc b/apps/app_shim/extension_app_shim_handler_mac.cc index b33585c812510c..2fa33a11b03f6d 100644 --- a/apps/app_shim/extension_app_shim_handler_mac.cc +++ b/apps/app_shim/extension_app_shim_handler_mac.cc @@ -10,7 +10,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" #include "apps/launcher.h" -#include "apps/ui/native_app_window.h" #include "base/files/file_path.h" #include "base/logging.h" #include "chrome/browser/browser_process.h" @@ -25,6 +24,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_host.h" #include "extensions/browser/extension_registry.h" #include "ui/base/cocoa/focus_window_set.h" diff --git a/apps/app_window.cc b/apps/app_window.cc index 2366ca81500462..1fa81393c7bb75 100644 --- a/apps/app_window.cc +++ b/apps/app_window.cc @@ -13,7 +13,6 @@ #include "apps/app_window_geometry_cache.h" #include "apps/app_window_registry.h" #include "apps/ui/apps_client.h" -#include "apps/ui/native_app_window.h" #include "apps/ui/web_contents_sizer.h" #include "base/command_line.h" #include "base/strings/string_util.h" @@ -33,6 +32,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/common/media_stream_request.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/app_window/size_constraints.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" @@ -58,6 +58,7 @@ using content::BrowserContext; using content::ConsoleMessageLevel; using content::WebContents; using extensions::APIPermission; +using extensions::NativeAppWindow; using web_modal::WebContentsModalDialogHost; using web_modal::WebContentsModalDialogManager; diff --git a/apps/app_window.h b/apps/app_window.h index 4239d010b8923c..87c3c4599b310b 100644 --- a/apps/app_window.h +++ b/apps/app_window.h @@ -36,6 +36,7 @@ class WebContents; namespace extensions { class Extension; +class NativeAppWindow; class PlatformAppBrowserTest; class WindowController; @@ -50,7 +51,6 @@ namespace apps { class AppDelegate; class AppWebContentsHelper; -class NativeAppWindow; // Manages the web contents for app windows. The implementation for this // class should create and maintain the WebContents for the window, and handle @@ -69,7 +69,8 @@ class AppWindowContents { virtual void LoadContents(int32 creator_process_id) = 0; // Called when the native window changes. - virtual void NativeWindowChanged(NativeAppWindow* native_app_window) = 0; + virtual void NativeWindowChanged( + extensions::NativeAppWindow* native_app_window) = 0; // Called when the native window closes. virtual void NativeWindowClosed() = 0; @@ -232,7 +233,7 @@ class AppWindow : public content::NotificationObserver, bool is_hidden() const { return is_hidden_; } const extensions::Extension* GetExtension() const; - NativeAppWindow* GetBaseWindow(); + extensions::NativeAppWindow* GetBaseWindow(); gfx::NativeWindow GetNativeWindow(); // Returns the bounds that should be reported to the renderer. @@ -500,7 +501,7 @@ class AppWindow : public content::NotificationObserver, // An object to load the badge as an extension resource. scoped_ptr badge_icon_image_; - scoped_ptr native_app_window_; + scoped_ptr native_app_window_; scoped_ptr app_window_contents_; scoped_ptr app_delegate_; scoped_ptr helper_; diff --git a/apps/app_window_browsertest.cc b/apps/app_window_browsertest.cc index 22446a3656ee75..a132a1b62ba028 100644 --- a/apps/app_window_browsertest.cc +++ b/apps/app_window_browsertest.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "apps/ui/native_app_window.h" #include "chrome/browser/apps/app_browsertest_util.h" +#include "extensions/browser/app_window/native_app_window.h" using extensions::Extension; +using extensions::NativeAppWindow; namespace apps { diff --git a/apps/app_window_contents.cc b/apps/app_window_contents.cc index 84cf13d8e9cba2..783564a5a93ab1 100644 --- a/apps/app_window_contents.cc +++ b/apps/app_window_contents.cc @@ -4,10 +4,9 @@ #include "apps/app_window_contents.h" -#include #include +#include -#include "apps/ui/native_app_window.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/common/extensions/api/app_window.h" #include "content/public/browser/browser_context.h" @@ -18,6 +17,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/common/renderer_preferences.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/extension_messages.h" namespace app_window = extensions::api::app_window; @@ -65,7 +65,7 @@ void AppWindowContentsImpl::LoadContents(int32 creator_process_id) { } void AppWindowContentsImpl::NativeWindowChanged( - NativeAppWindow* native_app_window) { + extensions::NativeAppWindow* native_app_window) { base::ListValue args; base::DictionaryValue* dictionary = new base::DictionaryValue(); args.Append(dictionary); diff --git a/apps/app_window_contents.h b/apps/app_window_contents.h index 47d082b3c62f58..87629133fa1d41 100644 --- a/apps/app_window_contents.h +++ b/apps/app_window_contents.h @@ -38,7 +38,8 @@ class AppWindowContentsImpl virtual void Initialize(content::BrowserContext* context, const GURL& url) OVERRIDE; virtual void LoadContents(int32 creator_process_id) OVERRIDE; - virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE; + virtual void NativeWindowChanged( + extensions::NativeAppWindow* native_app_window) OVERRIDE; virtual void NativeWindowClosed() OVERRIDE; virtual void DispatchWindowShownForTests() const OVERRIDE; virtual content::WebContents* GetWebContents() const OVERRIDE; diff --git a/apps/app_window_interactive_uitest.cc b/apps/app_window_interactive_uitest.cc index 4433ca93053684..665d465663f78c 100644 --- a/apps/app_window_interactive_uitest.cc +++ b/apps/app_window_interactive_uitest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "apps/ui/native_app_window.h" #include "chrome/browser/apps/app_browsertest_util.h" +#include "extensions/browser/app_window/native_app_window.h" using extensions::PlatformAppBrowserTest; using extensions::Extension; diff --git a/apps/app_window_registry.cc b/apps/app_window_registry.cc index 79a3373eba227d..0874a5ee15d570 100644 --- a/apps/app_window_registry.cc +++ b/apps/app_window_registry.cc @@ -9,7 +9,6 @@ #include "apps/app_window.h" #include "apps/ui/apps_client.h" -#include "apps/ui/native_app_window.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/devtools_agent_host.h" @@ -17,6 +16,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/app_window/native_app_window.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" diff --git a/apps/apps.gypi b/apps/apps.gypi index 2f7f9e9f089d6e..e6580c53093b47 100644 --- a/apps/apps.gypi +++ b/apps/apps.gypi @@ -65,7 +65,6 @@ 'switches.h', 'ui/apps_client.cc', 'ui/apps_client.h', - 'ui/native_app_window.h', 'ui/views/app_window_frame_view.cc', 'ui/views/app_window_frame_view.h', 'ui/views/native_app_window_views.cc', diff --git a/apps/ui/apps_client.h b/apps/ui/apps_client.h index 2f26dbcf05d8fb..da4b2bf8d1fe4c 100644 --- a/apps/ui/apps_client.h +++ b/apps/ui/apps_client.h @@ -15,12 +15,11 @@ class BrowserContext; namespace extensions { class Extension; +class NativeAppWindow; } namespace apps { -class NativeAppWindow; - // Sets up global state for the apps system. Should be Set() once in each // process. This should be implemented by the client of the apps system. class AppsClient { @@ -34,8 +33,8 @@ class AppsClient { content::BrowserContext* context, const extensions::Extension* extension) = 0; - // Creates a new apps::NativeAppWindow for |window|. - virtual NativeAppWindow* CreateNativeAppWindow( + // Creates a new extensions::NativeAppWindow for |window|. + virtual extensions::NativeAppWindow* CreateNativeAppWindow( AppWindow* window, const AppWindow::CreateParams& params) = 0; diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc index 4fd095587620ce..7ca0180cc8f96c 100644 --- a/apps/ui/views/app_window_frame_view.cc +++ b/apps/ui/views/app_window_frame_view.cc @@ -4,8 +4,8 @@ #include "apps/ui/views/app_window_frame_view.h" -#include "apps/ui/native_app_window.h" #include "base/strings/utf_string_conversions.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/draggable_region.h" #include "grit/theme_resources.h" #include "grit/ui_strings.h" // Accessibility names @@ -38,7 +38,7 @@ const char AppWindowFrameView::kViewClassName[] = "browser/ui/views/extensions/AppWindowFrameView"; AppWindowFrameView::AppWindowFrameView(views::Widget* widget, - NativeAppWindow* window, + extensions::NativeAppWindow* window, bool draw_frame, const SkColor& active_frame_color, const SkColor& inactive_frame_color) diff --git a/apps/ui/views/app_window_frame_view.h b/apps/ui/views/app_window_frame_view.h index d7cbf9fc48a4a5..19a982c310ec98 100644 --- a/apps/ui/views/app_window_frame_view.h +++ b/apps/ui/views/app_window_frame_view.h @@ -16,6 +16,10 @@ class SkRegion; +namespace extensions { +class NativeAppWindow; +} + namespace gfx { class Canvas; class Point; @@ -32,8 +36,6 @@ class Widget; namespace apps { -class NativeAppWindow; - // A frameless or non-Ash, non-panel NonClientFrameView for app windows. class AppWindowFrameView : public views::NonClientFrameView, public views::ButtonListener { @@ -49,7 +51,7 @@ class AppWindowFrameView : public views::NonClientFrameView, // TODO(benwells): Refactor this to split out frameless and colored frame // views. See http://crbug.com/359432. AppWindowFrameView(views::Widget* widget, - NativeAppWindow* window, + extensions::NativeAppWindow* window, bool draw_frame, const SkColor& active_frame_color, const SkColor& inactive_frame_color); @@ -96,7 +98,7 @@ class AppWindowFrameView : public views::NonClientFrameView, SkColor CurrentFrameColor(); views::Widget* widget_; - NativeAppWindow* window_; + extensions::NativeAppWindow* window_; bool draw_frame_; SkColor active_frame_color_; SkColor inactive_frame_color_; diff --git a/apps/ui/views/native_app_window_views.h b/apps/ui/views/native_app_window_views.h index 666d1a99c651c6..94bc96008e9d8b 100644 --- a/apps/ui/views/native_app_window_views.h +++ b/apps/ui/views/native_app_window_views.h @@ -5,9 +5,10 @@ #ifndef APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ #define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_ -#include "apps/ui/native_app_window.h" +#include "apps/app_window.h" #include "base/observer_list.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/app_window/size_constraints.h" #include "ui/gfx/rect.h" #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" @@ -42,7 +43,7 @@ class AppWindowFrameView; // A NativeAppWindow backed by a views::Widget. This class may be used alone // as a stub or subclassed (for example, ChromeNativeAppWindowViews). -class NativeAppWindowViews : public NativeAppWindow, +class NativeAppWindowViews : public extensions::NativeAppWindow, public content::WebContentsObserver, public views::WidgetDelegateView, public views::WidgetObserver { diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index a3572deb76274c..f727059771d28b 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -5,7 +5,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" #include "apps/launcher.h" -#include "apps/ui/native_app_window.h" #include "base/bind.h" #include "base/command_line.h" #include "base/file_util.h" @@ -38,6 +37,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/apps/app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc index 86974316b6672a..42fc891db18c2d 100644 --- a/chrome/browser/apps/app_browsertest_util.cc +++ b/chrome/browser/apps/app_browsertest_util.cc @@ -6,7 +6,6 @@ #include "apps/app_window_contents.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/switches.h" using apps::AppWindow; diff --git a/chrome/browser/apps/app_window_interactive_uitest.cc b/chrome/browser/apps/app_window_interactive_uitest.cc index 171e065880c03c..3aad63121a2840 100644 --- a/chrome/browser/apps/app_window_interactive_uitest.cc +++ b/chrome/browser/apps/app_window_interactive_uitest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "apps/ui/native_app_window.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/test/base/interactive_test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #if defined(OS_MACOSX) && !defined(OS_IOS) #include "base/mac/mac_util.h" @@ -20,7 +20,7 @@ #include "ui/views/win/hwnd_util.h" #endif -using apps::NativeAppWindow; +using extensions::NativeAppWindow; // Helper class that has to be created in the stack to check if the fullscreen // setting of a NativeWindow has changed since the creation of the object. diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index e62ce49c98f5b8..1f2477e0e10b69 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "apps/ui/native_app_window.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -29,6 +28,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/fake_speech_recognition_manager.h" #include "content/public/test/test_renderer_host.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/guest_view/guest_view_manager.h" #include "extensions/browser/guest_view/guest_view_manager_factory.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index e67f2389cba034..1cce76bb6db131 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -4,7 +4,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/desktop_background_controller_observer.h" #include "ash/shell.h" @@ -47,6 +46,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_system.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_switches.h" diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 17071d6ee28fe3..b9991a721c167b 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -7,8 +7,8 @@ #include #include +#include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "ash/shell.h" #include "ash/system/chromeos/session/logout_confirmation_controller.h" #include "ash/system/chromeos/session/logout_confirmation_dialog.h" @@ -114,6 +114,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "crypto/rsa_private_key.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/management_policy.h" #include "extensions/browser/notification_types.h" diff --git a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc index cb95fd3825616e..36b63e902f8a8d 100644 --- a/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc +++ b/chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.cc @@ -6,12 +6,12 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/command_line.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/app_current_window_internal.h" #include "chrome/common/extensions/api/app_window.h" #include "chrome/common/extensions/features/feature_channel.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/app_window/size_constraints.h" #include "extensions/common/features/simple_feature.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc index 0f578acc8d9d36..e469c2c893e6b2 100644 --- a/chrome/browser/extensions/api/app_window/app_window_api.cc +++ b/chrome/browser/extensions/api/app_window/app_window_api.cc @@ -8,7 +8,6 @@ #include "apps/app_window_contents.h" #include "apps/app_window_registry.h" #include "apps/ui/apps_client.h" -#include "apps/ui/native_app_window.h" #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -24,6 +23,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/image_util.h" #include "extensions/common/features/simple_feature.h" diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc index f53469bbf02bb9..7227be347f93c6 100644 --- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc +++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc @@ -4,7 +4,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/apps/app_browsertest_util.h" @@ -12,6 +11,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/browser/app_window/native_app_window.h" #include "ui/base/base_window.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc index 8fd853499c8a63..1750c01b276010 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h" -#include "apps/ui/native_app_window.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" @@ -17,12 +16,13 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" #include "ui/gfx/image/image.h" using apps::AppWindow; -using apps::NativeAppWindow; +using extensions::NativeAppWindow; // AshPanelWindowController ---------------------------------------------------- diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h index 3edd0b565a9c6d..55ff4f5a08cac5 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h @@ -43,8 +43,8 @@ class AshPanelContents virtual void Initialize(content::BrowserContext* context, const GURL& url) OVERRIDE; virtual void LoadContents(int32 creator_process_id) OVERRIDE; - virtual void NativeWindowChanged(apps::NativeAppWindow* native_app_window) - OVERRIDE; + virtual void NativeWindowChanged( + extensions::NativeAppWindow* native_app_window) OVERRIDE; virtual void NativeWindowClosed() OVERRIDE; virtual void DispatchWindowShownForTests() const OVERRIDE; virtual content::WebContents* GetWebContents() const OVERRIDE; diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index d6379e3c477663..ba0250a23ce7f1 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -160,10 +160,10 @@ #if !defined(OS_MACOSX) #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/ui/extensions/application_launch.h" +#include "extensions/browser/app_window/native_app_window.h" #include "ui/base/window_open_disposition.h" #endif diff --git a/chrome/browser/ui/apps/chrome_apps_client.cc b/chrome/browser/ui/apps/chrome_apps_client.cc index 3e43b5e76f49be..d7c6c53dc2be5b 100644 --- a/chrome/browser/ui/apps/chrome_apps_client.cc +++ b/chrome/browser/ui/apps/chrome_apps_client.cc @@ -47,7 +47,7 @@ apps::AppWindow* ChromeAppsClient::CreateAppWindow( #endif } -apps::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindow( +extensions::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindow( apps::AppWindow* window, const apps::AppWindow::CreateParams& params) { #if defined(OS_ANDROID) diff --git a/chrome/browser/ui/apps/chrome_apps_client.h b/chrome/browser/ui/apps/chrome_apps_client.h index 1b6ae6e254bbe5..eabc81dd2a51a2 100644 --- a/chrome/browser/ui/apps/chrome_apps_client.h +++ b/chrome/browser/ui/apps/chrome_apps_client.h @@ -30,14 +30,14 @@ class ChromeAppsClient : public apps::AppsClient { virtual apps::AppWindow* CreateAppWindow( content::BrowserContext* context, const extensions::Extension* extension) OVERRIDE; - virtual apps::NativeAppWindow* CreateNativeAppWindow( + virtual extensions::NativeAppWindow* CreateNativeAppWindow( apps::AppWindow* window, const apps::AppWindow::CreateParams& params) OVERRIDE; virtual void IncrementKeepAliveCount() OVERRIDE; virtual void DecrementKeepAliveCount() OVERRIDE; // Implemented in platform specific code. - static apps::NativeAppWindow* CreateNativeAppWindowImpl( + static extensions::NativeAppWindow* CreateNativeAppWindowImpl( apps::AppWindow* window, const apps::AppWindow::CreateParams& params); diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc index 34c64f2f1b85b0..67705d1ddde861 100644 --- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc @@ -5,7 +5,6 @@ #include "ash/accelerators/accelerator_commands.h" #include "apps/app_window.h" -#include "apps/ui/native_app_window.h" #include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/wm/window_state.h" @@ -18,6 +17,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" +#include "extensions/browser/app_window/native_app_window.h" #include "ui/aura/client/aura_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" @@ -281,7 +281,8 @@ IN_PROC_BROWSER_TEST_P(AcceleratorCommandsPlatformAppFullscreenBrowserTest, apps::AppWindow::CreateParams params; params.frame = apps::AppWindow::FRAME_CHROME; apps::AppWindow* app_window = CreateAppWindowFromParams(extension, params); - apps::NativeAppWindow* native_app_window = app_window->GetBaseWindow(); + extensions::NativeAppWindow* native_app_window = + app_window->GetBaseWindow(); SetToInitialShowState(app_window); ASSERT_TRUE(app_window->GetBaseWindow()->IsActive()); EXPECT_TRUE(IsInitialShowState(app_window)); @@ -304,7 +305,8 @@ IN_PROC_BROWSER_TEST_P(AcceleratorCommandsPlatformAppFullscreenBrowserTest, apps::AppWindow::CreateParams params; params.frame = apps::AppWindow::FRAME_NONE; apps::AppWindow* app_window = CreateAppWindowFromParams(extension, params); - apps::NativeAppWindow* native_app_window = app_window->GetBaseWindow(); + extensions::NativeAppWindow* native_app_window = + app_window->GetBaseWindow(); ASSERT_TRUE(app_window->GetBaseWindow()->IsActive()); SetToInitialShowState(app_window); EXPECT_TRUE(IsInitialShowState(app_window)); diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc index 81916fe8832181..3b0147979836a9 100644 --- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "ash/keyboard_overlay/keyboard_overlay_view.h" #include "chrome/browser/chromeos/file_manager/app_id.h" #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_system.h" ChromeNewWindowDelegateChromeos::ChromeNewWindowDelegateChromeos() {} diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc index 44646cb050592e..ba88193e79335d 100644 --- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h" -#include "apps/ui/native_app_window.h" #include "ash/shelf/shelf_model.h" #include "ash/shell.h" #include "ash/wm/window_util.h" @@ -26,6 +25,7 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/process_manager.h" #include "ui/aura/window.h" diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc index ef85785559f7d4..fc61bab7531672 100644 --- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h" #include "apps/app_window.h" -#include "apps/ui/native_app_window.h" #include "ash/shelf/shelf_model.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/app_window/native_app_window.h" #include "skia/ext/image_operations.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 61eb0a900a0333..54618e82d0e444 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -6,7 +6,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "ash/ash_switches.h" #include "ash/display/display_controller.h" #include "ash/shelf/shelf.h" @@ -52,6 +51,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_system.h" #include "extensions/common/constants.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index b9ae930a26c6c3..7f94b7b8f7d31d 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -49,7 +49,6 @@ #if defined(OS_CHROMEOS) #include "apps/app_window_contents.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" #include "chrome/browser/chromeos/login/users/fake_user_manager.h" @@ -66,6 +65,7 @@ #include "chrome/test/base/testing_profile_manager.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #include "ui/aura/window.h" #endif diff --git a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc index d7f7233ec2f85b..d5ca052d9dfb84 100644 --- a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc @@ -5,12 +5,12 @@ #include "chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h" #include "apps/app_window.h" -#include "apps/ui/native_app_window.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" #include "chrome/browser/ui/host_desktop.h" +#include "extensions/browser/app_window/native_app_window.h" #include "ui/aura/window.h" namespace { diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index 9547f983d56aae..aefca1c3fcd436 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -10,7 +10,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/base64.h" #include "base/bind.h" #include "base/bind_helpers.h" @@ -76,6 +75,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "extensions/browser/app_window/native_app_window.h" #include "grit/chromium_strings.h" #include "grit/component_scaled_resources.h" #include "grit/components_strings.h" diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm index 9e04e47dbfd8ae..1679709210f8b0 100644 --- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm @@ -7,7 +7,6 @@ #import #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/command_line.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/cocoa/apps/chrome_apps_client_cocoa.mm b/chrome/browser/ui/cocoa/apps/chrome_apps_client_cocoa.mm index f2d8196f0d71ac..de21634da2da81 100644 --- a/chrome/browser/ui/cocoa/apps/chrome_apps_client_cocoa.mm +++ b/chrome/browser/ui/cocoa/apps/chrome_apps_client_cocoa.mm @@ -7,7 +7,7 @@ #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" // static -apps::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindowImpl( +extensions::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindowImpl( apps::AppWindow* app_window, const apps::AppWindow::CreateParams& params) { return new NativeAppWindowCocoa(app_window, params); diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h index fbe5060c0fe8ce..340266b321d7c7 100644 --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h @@ -8,11 +8,12 @@ #import #include -#include "apps/ui/native_app_window.h" +#include "apps/app_window.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/browser_command_executor.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/app_window/size_constraints.h" #include "extensions/common/draggable_region.h" #include "ui/base/accelerators/accelerator_manager.h" @@ -47,7 +48,7 @@ class SkRegion; @end // Cocoa bridge to AppWindow. -class NativeAppWindowCocoa : public apps::NativeAppWindow, +class NativeAppWindowCocoa : public extensions::NativeAppWindow, public content::WebContentsObserver { public: NativeAppWindowCocoa(apps::AppWindow* app_window, diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm index 66edc3894c2edf..9add35759afc82 100644 --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm @@ -56,11 +56,11 @@ void SetUpAppWithWindows(int num_windows) { apps::AppWindowRegistry::Get(profile())->app_windows(); apps::AppWindow* app_window = windows.front(); - apps::NativeAppWindow* native_window = app_window->GetBaseWindow(); + extensions::NativeAppWindow* native_window = app_window->GetBaseWindow(); NSWindow* ns_window = native_window->GetNativeWindow(); apps::AppWindow* other_app_window = windows.back(); - apps::NativeAppWindow* other_native_window = + extensions::NativeAppWindow* other_native_window = other_app_window->GetBaseWindow(); NSWindow* other_ns_window = other_native_window->GetNativeWindow(); @@ -171,7 +171,7 @@ - (void)waitForNotification { SetUpAppWithWindows(1); apps::AppWindow* app_window = GetFirstAppWindow(); - apps::NativeAppWindow* window = app_window->GetBaseWindow(); + extensions::NativeAppWindow* window = app_window->GetBaseWindow(); NSWindow* ns_window = app_window->GetNativeWindow(); base::scoped_nsobject watcher; diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc index 5560387fefc109..1c238c780ec233 100644 --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc @@ -6,7 +6,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" #include "base/prefs/pref_registry_simple.h" @@ -20,6 +19,7 @@ #include "chrome/browser/ui/browser_iterator.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/extension.h" #include "grit/chrome_unscaled_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc index b2ae65b3b7fff4..03ff030e4fdc3a 100644 --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/command_line.h" #include "base/run_loop.h" #include "chrome/browser/apps/app_browsertest_util.h" @@ -22,6 +21,7 @@ #include "chrome/common/chrome_switches.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/common/extension.h" #include "ui/message_center/message_center.h" diff --git a/chrome/browser/ui/views/apps/chrome_apps_client_views.cc b/chrome/browser/ui/views/apps/chrome_apps_client_views.cc index 0c89bf37606527..4c72e4cfc5c36e 100644 --- a/chrome/browser/ui/views/apps/chrome_apps_client_views.cc +++ b/chrome/browser/ui/views/apps/chrome_apps_client_views.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" // static -apps::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindowImpl( +extensions::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindowImpl( apps::AppWindow* app_window, const apps::AppWindow::CreateParams& params) { ChromeNativeAppWindowViews* window = new ChromeNativeAppWindowViews; diff --git a/chrome/browser/ui/views/apps/chrome_apps_client_views_win.cc b/chrome/browser/ui/views/apps/chrome_apps_client_views_win.cc index 2456e27ca53760..9f8c0750fdbd95 100644 --- a/chrome/browser/ui/views/apps/chrome_apps_client_views_win.cc +++ b/chrome/browser/ui/views/apps/chrome_apps_client_views_win.cc @@ -7,7 +7,7 @@ #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h" // static -apps::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindowImpl( +extensions::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindowImpl( apps::AppWindow* app_window, const apps::AppWindow::CreateParams& params) { ChromeNativeAppWindowViewsWin* window = new ChromeNativeAppWindowViewsWin; diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc index 796900c539e8a4..43468ca702bdf7 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc @@ -124,7 +124,7 @@ class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate, public aura::WindowObserver { public: NativeAppWindowStateDelegate(AppWindow* app_window, - apps::NativeAppWindow* native_app_window) + extensions::NativeAppWindow* native_app_window) : app_window_(app_window), window_state_( ash::wm::GetWindowState(native_app_window->GetNativeWindow())) { diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h index a9b9ff17267348..cae27b4491d5cb 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h @@ -21,7 +21,7 @@ class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews { GlassAppWindowFrameViewWin* glass_frame_view() { return glass_frame_view_; - }; + } private: void ActivateParentDesktopIfNecessary(); @@ -44,7 +44,7 @@ class ChromeNativeAppWindowViewsWin : public ChromeNativeAppWindowViews { virtual void Show() OVERRIDE; virtual void Activate() OVERRIDE; - // Overridden from apps::NativeAppWindow: + // Overridden from extensions::NativeAppWindow: virtual void UpdateShelfMenu() OVERRIDE; base::WeakPtrFactory weak_ptr_factory_; diff --git a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc index 34cc0a31bba07d..bf2be0576ea785 100644 --- a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc +++ b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h" -#include "apps/ui/native_app_window.h" +#include "extensions/browser/app_window/native_app_window.h" #include "ui/base/hit_test.h" #include "ui/gfx/win/dpi.h" #include "ui/views/widget/widget.h" @@ -20,7 +20,7 @@ const char GlassAppWindowFrameViewWin::kViewClassName[] = "ui/views/apps/GlassAppWindowFrameViewWin"; GlassAppWindowFrameViewWin::GlassAppWindowFrameViewWin( - apps::NativeAppWindow* window, + extensions::NativeAppWindow* window, views::Widget* widget) : window_(window), widget_(widget) { } diff --git a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h index 62937ce8c07574..982706ca349796 100644 --- a/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h +++ b/chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h @@ -8,7 +8,7 @@ #include "ui/gfx/geometry/insets.h" #include "ui/views/window/non_client_view.h" -namespace apps { +namespace extensions { class NativeAppWindow; } @@ -17,7 +17,7 @@ class GlassAppWindowFrameViewWin : public views::NonClientFrameView { public: static const char kViewClassName[]; - explicit GlassAppWindowFrameViewWin(apps::NativeAppWindow* window, + explicit GlassAppWindowFrameViewWin(extensions::NativeAppWindow* window, views::Widget* widget); virtual ~GlassAppWindowFrameViewWin(); @@ -41,7 +41,7 @@ class GlassAppWindowFrameViewWin : public views::NonClientFrameView { virtual gfx::Size GetMinimumSize() const OVERRIDE; virtual gfx::Size GetMaximumSize() const OVERRIDE; - apps::NativeAppWindow* window_; + extensions::NativeAppWindow* window_; views::Widget* widget_; DISALLOW_COPY_AND_ASSIGN(GlassAppWindowFrameViewWin); diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc index ace30acb84ef89..05c6ae439de748 100644 --- a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc +++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc @@ -23,7 +23,7 @@ class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase { views::Widget* widget() { return widget_.get(); } - apps::NativeAppWindow* app_window() { return &app_window_; } + extensions::NativeAppWindow* app_window() { return &app_window_; } ChromeNativeAppWindowViews* app_window_views() { return &app_window_; } protected: diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc index d09ced98a5cceb..bde26c0671a394 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension.cc @@ -6,7 +6,6 @@ #include "apps/app_window.h" #include "apps/app_window_registry.h" -#include "apps/ui/native_app_window.h" #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" @@ -34,6 +33,7 @@ #include "chrome/browser/ui/views/extensions/extension_dialog.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/app_window/native_app_window.h" #include "extensions/browser/extension_system.h" #include "ui/base/base_window.h" #include "ui/shell_dialogs/selected_file_info.h" diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn index b6e6c5e310d582..6bf06fb376d152 100644 --- a/extensions/browser/BUILD.gn +++ b/extensions/browser/BUILD.gn @@ -14,6 +14,7 @@ source_set("browser") { "//components/keyed_service/content", "//components/keyed_service/core", "//components/pref_registry", + "//components/web_modal", "//content/public/browser", "//extensions/common", "//extensions/common/api", @@ -125,6 +126,7 @@ source_set("browser") { "api/usb/usb_device_resource.h", "api_activity_monitor.h", "app_sorting.h", + "app_window/native_app_window.h", "app_window/size_constraints.cc", "app_window/size_constraints.h", "blacklist_state.h", diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index 08dfbdf0645aae..9fd9b42c3eb488 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+components/keyed_service", "+components/pref_registry", + "+components/web_modal", "+content/public/browser", "+grit/extensions_strings.h", "+net", diff --git a/apps/ui/native_app_window.h b/extensions/browser/app_window/native_app_window.h similarity index 87% rename from apps/ui/native_app_window.h rename to extensions/browser/app_window/native_app_window.h index 3ad531d16d56ca..afd65c5cc8f863 100644 --- a/apps/ui/native_app_window.h +++ b/extensions/browser/app_window/native_app_window.h @@ -1,17 +1,25 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APPS_UI_NATIVE_APP_WINDOW_H_ -#define APPS_UI_NATIVE_APP_WINDOW_H_ +#ifndef EXTENSIONS_BROWSER_APP_WINDOW_NATIVE_APP_WINDOW_H_ +#define EXTENSIONS_BROWSER_APP_WINDOW_NATIVE_APP_WINDOW_H_ -#include "apps/app_window.h" +#include + +#include "base/memory/scoped_ptr.h" #include "components/web_modal/web_contents_modal_dialog_host.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/base_window.h" #include "ui/gfx/insets.h" -namespace apps { +namespace content { +struct NativeWebKeyboardEvent; +} + +namespace extensions { + +struct DraggableRegion; // This is an interface to a native implementation of a app window, used for // new-style packaged apps. App windows contain a web contents, but no tabs @@ -37,7 +45,7 @@ class NativeAppWindow : public ui::BaseWindow, // Called when the draggable regions are changed. virtual void UpdateDraggableRegions( - const std::vector& regions) = 0; + const std::vector& regions) = 0; // Returns the region used by frameless windows for dragging. May return NULL. virtual SkRegion* GetDraggableRegion() = 0; @@ -91,6 +99,6 @@ class NativeAppWindow : public ui::BaseWindow, virtual ~NativeAppWindow() {} }; -} // namespace apps +} // namespace extensions -#endif // APPS_UI_NATIVE_APP_WINDOW_H_ +#endif // EXTENSIONS_BROWSER_APP_WINDOW_NATIVE_APP_WINDOW_H_ diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 10fb21217e6ce7..83f680f4cd7461 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -256,6 +256,7 @@ '../components/components.gyp:keyed_service_core', '../components/components.gyp:pref_registry', '../components/components.gyp:usb_service', + '../components/components.gyp:web_modal', '../content/content.gyp:content_browser', '../device/serial/serial.gyp:device_serial', '../skia/skia.gyp:skia', @@ -375,6 +376,7 @@ 'browser/api/usb_private/usb_private_api.h', 'browser/api_activity_monitor.h', 'browser/app_sorting.h', + 'browser/app_window/native_app_window.h', 'browser/app_window/size_constraints.cc', 'browser/app_window/size_constraints.h', 'browser/blacklist_state.h',