Revert 215753 "Move native_app_window code to apps areas"

> Move native_app_window code to apps areas > > native_app_window.h -> apps component > platform specific implementations of this are now in c/b/ui/xxx/apps. > > The platform specific implementations should also move to apps/ but > they would currently bring some unwanted dependencies with them; that > can happen later. > > BUG=159366 > > Review URL: https://chromiumcodereview.appspot.com/21344002 TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/22355002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215781 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Aug 6, 2013 · bfe665c · bfe665c
1 parent d3c4b75
commit bfe665c
Show file tree

Hide file tree

Showing 39 changed files with 106 additions and 137 deletions.
diff --git a/apps/DEPS b/apps/DEPS
@@ -18,6 +18,7 @@ include_rules = [
   "+chrome/browser/lifetime/application_lifetime.h",
   "+chrome/browser/profiles",
   "+chrome/browser/sessions/session_id.h",
+  "+chrome/browser/ui/extensions/native_app_window.h",
   "+chrome/browser/ui/host_desktop.h",
   "+chrome/common/chrome_switches.h",
   "+chrome/common/extensions",

diff --git a/apps/app_shim/extension_app_shim_handler_mac.cc b/apps/app_shim/extension_app_shim_handler_mac.cc
@@ -7,7 +7,6 @@
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/app_shim/app_shim_host_manager_mac.h"
 #include "apps/app_shim/app_shim_messages.h"
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/web_applications/web_app_mac.h"
 #include "content/public/browser/notification_details.h"

diff --git a/apps/app_window_contents.cc b/apps/app_window_contents.cc
@@ -4,9 +4,9 @@
 
 #include "apps/app_window_contents.h"
 
-#include "apps/native_app_window.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/browser_thread.h"

diff --git a/apps/apps.gypi b/apps/apps.gypi
@@ -55,7 +55,6 @@
         'field_trial_names.cc',
         'field_trial_names.h',
         'metrics_names.h',
-        'native_app_window.h',
         'pref_names.cc',
         'pref_names.h',
         'prefs.cc',

diff --git a/apps/shell_window.cc b/apps/shell_window.cc
@@ -4,7 +4,6 @@
 
 #include "apps/shell_window.h"
 
-#include "apps/native_app_window.h"
 #include "apps/shell_window_geometry_cache.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
@@ -156,7 +156,7 @@ void ShellWindow::Init(const GURL& url,
 
   new_params.bounds = bounds;
 
-  native_app_window_.reset(delegate_->CreateNativeAppWindow(this, new_params));
+  native_app_window_.reset(NativeAppWindow::Create(this, new_params));
 
   if (!new_params.hidden) {
     if (window_type_is_panel())

diff --git a/apps/shell_window.h b/apps/shell_window.h
@@ -21,6 +21,7 @@
 
 class GURL;
 class Profile;
+class NativeAppWindow;
 class SkRegion;
 
 namespace content {
@@ -41,8 +42,6 @@ class BaseWindow;
 
 namespace apps {
 
-class NativeAppWindow;
-
 // Manages the web contents for Shell Windows. The implementation for this
 // class should create and maintain the WebContents for the window, and handle
 // any message passing between the web contents and the extension system or
@@ -131,9 +130,6 @@ class ShellWindow : public content::NotificationObserver,
 
     // General initialization.
     virtual void InitWebContents(content::WebContents* web_contents) = 0;
-    virtual NativeAppWindow* CreateNativeAppWindow(
-        ShellWindow* window,
-        const CreateParams& params) = 0;
 
     // Link handling.
     virtual content::WebContents* OpenURLFromTab(

diff --git a/chrome/browser/extensions/DEPS b/chrome/browser/extensions/DEPS
@@ -5,7 +5,6 @@ include_rules = [
   # to depend on apps will be lifted.
   "-apps",
   "+apps/app_window_contents.h",
-  "+apps/native_app_window.h",
   "+apps/shell_window.h",
 
   # TODO(tfarina): Remove all these. crbug.com/125846.

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
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/extensions/api/app_current_window_internal/app_current_window_internal_api.h"
 
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "base/command_line.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
+#include "chrome/browser/ui/extensions/native_app_window.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.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
@@ -5,7 +5,6 @@
 #include "chrome/browser/extensions/api/app_window/app_window_api.h"
 
 #include "apps/app_window_contents.h"
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "content/public/browser/notification_registrar.h"
@@ -294,9 +294,10 @@ bool AppWindowCreateFunction::RunImpl() {
   if (force_maximize)
     create_params.state = ui::SHOW_STATE_MAXIMIZED;
 
-  ShellWindow* shell_window = new ShellWindow(profile(),
-                                              new ChromeShellWindowDelegate(),
-                                              GetExtension());
+  ShellWindow* shell_window = new ShellWindow(
+      profile(),
+      new chrome::ChromeShellWindowDelegate(),
+      GetExtension());
   shell_window->Init(url,
                      new apps::AppWindowContents(shell_window),
                      create_params);

diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.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 "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/test/base/testing_profile.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
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"
 
-#include "apps/native_app_window.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
@@ -14,14 +13,14 @@
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/image/image.h"
 
 using apps::ShellWindow;
-using apps::NativeAppWindow;
 
 // AshPanelWindowController ----------------------------------------------------
 

diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
@@ -41,8 +41,7 @@ class AshPanelContents : public apps::ShellWindowContents,
   // apps::ShellWindowContents
   virtual void Initialize(Profile* profile, const GURL& url) OVERRIDE;
   virtual void LoadContents(int32 creator_process_id) OVERRIDE;
-  virtual void NativeWindowChanged(apps::NativeAppWindow* native_app_window)
-      OVERRIDE;
+  virtual void NativeWindowChanged(NativeAppWindow* native_app_window) OVERRIDE;
   virtual void NativeWindowClosed() OVERRIDE;
   virtual content::WebContents* GetWebContents() const OVERRIDE;
 

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -588,7 +588,7 @@ bool WindowsCreateFunction::RunImpl() {
       create_params.bounds = window_bounds;
       create_params.focused = saw_focus_key && focused;
       ShellWindow* shell_window = new ShellWindow(
-          window_profile, new ChromeShellWindowDelegate(),
+          window_profile, new chrome::ChromeShellWindowDelegate(),
           GetExtension());
       AshPanelContents* ash_panel_contents = new AshPanelContents(shell_window);
       shell_window->Init(urls[0], ash_panel_contents, create_params);

diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_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/native_app_window.h"
 #include "apps/shell_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -32,6 +31,7 @@
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"

diff --git a/chrome/browser/extensions/platform_app_browsertest_util.cc b/chrome/browser/extensions/platform_app_browsertest_util.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 
 #include "apps/app_window_contents.h"
-#include "apps/native_app_window.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
@@ -14,6 +13,7 @@
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
@@ -27,7 +27,7 @@ namespace utils = extension_function_test_utils;
 namespace extensions {
 
 PlatformAppBrowserTest::PlatformAppBrowserTest() {
-  ChromeShellWindowDelegate::DisableExternalOpenForTesting();
+  chrome::ChromeShellWindowDelegate::DisableExternalOpenForTesting();
 }
 
 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
@@ -153,9 +153,10 @@ ShellWindow* PlatformAppBrowserTest::CreateShellWindow(
 
 ShellWindow* PlatformAppBrowserTest::CreateShellWindowFromParams(
     const Extension* extension, const ShellWindow::CreateParams& params) {
-  ShellWindow* window = new ShellWindow(browser()->profile(),
-                                        new ChromeShellWindowDelegate(),
-                                        extension);
+  ShellWindow* window = new ShellWindow(
+      browser()->profile(),
+      new chrome::ChromeShellWindowDelegate(),
+      extension);
   window->Init(GURL(std::string()),
                new apps::AppWindowContents(window),
                params);

diff --git a/chrome/browser/extensions/shell_window_registry.cc b/chrome/browser/extensions/shell_window_registry.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "content/public/browser/devtools_agent_host.h"

diff --git a/chrome/browser/ui/apps/chrome_shell_window_delegate.cc b/chrome/browser/ui/apps/chrome_shell_window_delegate.cc
@@ -25,6 +25,8 @@
 #include "ash/launcher/launcher_types.h"
 #endif
 
+namespace chrome {
+
 namespace {
 
 bool disable_external_open_for_testing_ = false;
@@ -63,12 +65,6 @@ void ChromeShellWindowDelegate::InitWebContents(
 #endif
 }
 
-apps::NativeAppWindow* ChromeShellWindowDelegate::CreateNativeAppWindow(
-    apps::ShellWindow* window,
-    const apps::ShellWindow::CreateParams& params) {
-  return CreateNativeAppWindowImpl(window, params);
-}
-
 content::WebContents* ChromeShellWindowDelegate::OpenURLFromTab(
     Profile* profile,
     content::WebContents* source,
@@ -152,3 +148,5 @@ bool ChromeShellWindowDelegate::IsWebContentsVisible(
     content::WebContents* web_contents) {
   return platform_util::IsVisible(web_contents->GetView()->GetNativeView());
 }
+
+}  // namespace chrome
diff --git a/chrome/browser/ui/apps/chrome_shell_window_delegate.h b/chrome/browser/ui/apps/chrome_shell_window_delegate.h
@@ -13,6 +13,8 @@
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/rect.h"
 
+namespace chrome {
+
 class ShellWindowLinkDelegate : public content::WebContentsDelegate {
  public:
   ShellWindowLinkDelegate();
@@ -36,9 +38,6 @@ class ChromeShellWindowDelegate : public apps::ShellWindow::Delegate {
  private:
   // apps::ShellWindow::Delegate:
   virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE;
-  virtual apps::NativeAppWindow* CreateNativeAppWindow(
-      apps::ShellWindow* window,
-      const apps::ShellWindow::CreateParams& params) OVERRIDE;
   virtual content::WebContents* OpenURLFromTab(
       Profile* profile,
       content::WebContents* source,
@@ -66,14 +65,11 @@ class ChromeShellWindowDelegate : public apps::ShellWindow::Delegate {
   virtual bool IsWebContentsVisible(
       content::WebContents* web_contents) OVERRIDE;
 
-  // Implemented in platform specific code.
-  static apps::NativeAppWindow* CreateNativeAppWindowImpl(
-      apps::ShellWindow* window,
-      const apps::ShellWindow::CreateParams& params);
-
   scoped_ptr<ShellWindowLinkDelegate> shell_window_link_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeShellWindowDelegate);
 };
 
+}  // namespace chrome
+
 #endif  // CHROME_BROWSER_UI_APPS_CHROME_SHELL_WINDOW_DELEGATE_H_
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "ash/ash_switches.h"
 #include "ash/host/root_window_host_factory.h"
@@ -38,6 +37,7 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/immersive_fullscreen_configuration.h"
 #include "chrome/common/chrome_switches.h"

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/immersive_fullscreen_configuration.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/aura/client/aura_constants.h"
@@ -175,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(ChromeShellDelegatePlatformAppBrowserTest,
 
   const extensions::Extension* extension = LoadAndLaunchPlatformApp("minimal");
   apps::ShellWindow* shell_window = CreateShellWindow(extension);
-  apps::NativeAppWindow* app_window = shell_window->GetBaseWindow();
+  NativeAppWindow* app_window = shell_window->GetBaseWindow();
   ASSERT_TRUE(shell_window->GetBaseWindow()->IsActive());
   EXPECT_FALSE(app_window->IsMaximized());
   EXPECT_FALSE(app_window->IsFullscreen());

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
-#include "apps/native_app_window.h"
 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
@@ -30,6 +29,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"