diff options
Diffstat (limited to 'chrome/browser')
36 files changed, 53 insertions, 49 deletions
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index a3572de..f727059 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 8697431..42fc891 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 171e065..3aad631 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 e62ce49..1f2477e 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 e67f238..1cce76b 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 17071d6..b9991a7 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 <string> #include <vector> +#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 cb95fd3..36b63e9 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 0f578ac..e469c2c 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 f53469b..7227be3 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 8fd8534..1750c01 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 3edd0b5..55ff4f5 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 d6379e3..ba0250a 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 3e43b5e..d7c6c53 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 1b6ae6e..eabc81d 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 34c64f2..67705d1 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 81916fe..3b01479 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 44646cb..ba88193 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 ef85785..fc61bab 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 61eb0a9..54618e8 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 b9ae930..7f94b7b 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 d7f7233..d5ca052 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 9547f98..aefca1c 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 9e04e47..1679709 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 <Cocoa/Cocoa.h> #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 f2d8196..de21634 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 fbe5060..340266b 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 <Cocoa/Cocoa.h> #include <vector> -#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 66edc38..9add357 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 @@ IN_PROC_BROWSER_TEST_F(NativeAppWindowCocoaBrowserTest, HideShowWithApp) { 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 @@ IN_PROC_BROWSER_TEST_F(NativeAppWindowCocoaBrowserTest, Fullscreen) { 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<ScopedNotificationWatcher> 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 5560387..1c238c7 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 b2ae65b..03ff030 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 0c89bf3..4c72e4c 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 2456e27..9f8c075 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 796900c..43468ca 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 a9b9ff1..cae27b4 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<ChromeNativeAppWindowViewsWin> 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 34cc0a3..bf2be05 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 62937ce..982706c 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 ace30ac..05c6ae4 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 d09ced9..bde26c0 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" |