Move native_app_window_views* to components/native_app_window and fixed up build files.

 This will be used in athena.

BUG=414968
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/576863003

Cr-Commit-Position: refs/heads/master@{#295502}

apps/BUILD.gn

@@ -58,8 +58,6 @@ static_library("apps") {
     sources += [
       "ui/views/app_window_frame_view.cc",
       "ui/views/app_window_frame_view.h",
-      "ui/views/native_app_window_views.cc",
-      "ui/views/native_app_window_views.h",
     ]
     deps += [
       "//ui/strings",

apps/apps.gypi

@@ -53,8 +53,6 @@
         'switches.h',
         'ui/views/app_window_frame_view.cc',
         'ui/views/app_window_frame_view.h',
-        'ui/views/native_app_window_views.cc',
-        'ui/views/native_app_window_views.h',
       ],
       'conditions': [
         ['chromeos==1',
@@ -76,6 +74,7 @@
         ],
         ['toolkit_views==1', {
           'dependencies': [
+            '../components/components.gyp:native_app_window',
             '../ui/strings/ui_strings.gyp:ui_strings',
             '../ui/views/views.gyp:views',
           ],

chrome/browser/BUILD.gn

@@ -69,6 +69,7 @@ static_library("browser") {
     "//components/metrics:gpu",
     "//components/metrics:net",
     "//components/metrics/proto:proto",
+    "//components/native_app_window",
     "//components/navigation_metrics",
     "//components/network_time",
     "//components/omaha_query_params",
@@ -230,6 +231,9 @@ static_library("browser") {
       #"app_shim"  TODO(GYP)
     ]
   }
+  if (!toolkit_views) {
+    deps -= [ "//components/native_app_window" ]
+  }
   if (cld2_data_source == "component") {
     sources += [
       "component_updater/cld_component_installer.cc",

chrome/browser/chromeos/login/DEPS

@@ -4,6 +4,7 @@ include_rules = [
   "+athena/screen/public",
   "+athena/util",
   "+components/captive_portal",
+  "+components/native_app_window",
   "+components/user_manager",
 
   # Library used for calculating CRC-32 needed for HWID verification.

chrome/browser/chromeos/login/kiosk_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/views/native_app_window_views.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
@@ -48,6 +47,7 @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
+#include "components/native_app_window/native_app_window_views.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
@@ -643,8 +643,9 @@ IN_PROC_BROWSER_TEST_F(KioskTest, ZoomSupport) {
       "window.domAutomationController.send(window.innerWidth);",
       &original_width));
 
-  apps::NativeAppWindowViews* native_app_window_views =
-      static_cast<apps::NativeAppWindowViews*>(window->GetBaseWindow());
+  native_app_window::NativeAppWindowViews* native_app_window_views =
+      static_cast<native_app_window::NativeAppWindowViews*>(
+          window->GetBaseWindow());
   ui::AcceleratorTarget* accelerator_target =
       static_cast<ui::AcceleratorTarget*>(native_app_window_views);
 

chrome/browser/ui/views/apps/DEPS

+include_rules = [
+ "+components/native_app_window"
+]

chrome/browser/ui/views/apps/chrome_native_app_window_views.h

@@ -5,10 +5,14 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_
 
-#include "apps/ui/views/native_app_window_views.h"
 #include "base/memory/scoped_ptr.h"
+#include "components/native_app_window/native_app_window_views.h"
 #include "ui/views/context_menu_controller.h"
 
+namespace apps {
+class AppWindowFrameView;
+}
+
 #if defined(USE_ASH)
 namespace ash {
 class ImmersiveFullscreenController;
@@ -21,8 +25,9 @@ namespace views {
 class MenuRunner;
 }
 
-class ChromeNativeAppWindowViews : public apps::NativeAppWindowViews,
-                                   public views::ContextMenuController {
+class ChromeNativeAppWindowViews
+    : public native_app_window::NativeAppWindowViews,
+      public views::ContextMenuController {
  public:
   ChromeNativeAppWindowViews();
   virtual ~ChromeNativeAppWindowViews();

chrome/chrome_browser.gypi

@@ -2992,6 +2992,11 @@
             'browser/metrics/signin_status_metrics_provider.h',
           ],
         }],
+        ['toolkit_views==1', {
+          'dependencies': [
+            '../components/components.gyp:native_app_window',
+          ],
+        }],
         ['enable_extensions==1', {
           'dependencies': [
             'browser_extensions',

components/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//build/config/ui.gni")
 
 # Collection of all components. You wouldn't link to this, but this is rather
 # to reference the files so they can be compiled by the build system.
@@ -50,6 +51,7 @@ group("all_components") {
     "//components/language_usage_metrics",
     "//components/leveldb_proto",
     "//components/metrics",
+    "//components/native_app_window",
     "//components/navigation_interception",
     "//components/navigation_metrics",
     "//components/network_time",
@@ -111,6 +113,9 @@ group("all_components") {
   if (!is_chromeos) {
     deps -= [ "//components/pairing" ]
   }
+  if (!toolkit_views) {
+    deps -= [ "//components/native_app_window" ]
+  }
 
   if (is_ios) {
     deps -= [ "//components/keyed_service/content" ]

components/OWNERS

@@ -96,6 +96,9 @@ per-file nacl*=mseaborn@chromium.org
 per-file nacl*=noelallen@chromium.org
 per-file nacl*=teravest@chromium.org
 
+per-file native_app_window*=benwells@chromium.org
+per-file native_app_window*=jamescook@chromium.org
+
 per-file navigation_interception.gypi=mkosiba@chromium.org
 
 per-file network_time.gypi=zea@chromium.org

components/components.gyp

@@ -112,6 +112,11 @@
         'invalidation.gypi',
       ],
     }],
+    ['toolkit_views==1', {
+      'includes': [
+        'native_app_window.gypi',
+      ],
+    }],
     ['enable_plugins==1', {
       'includes': [
         'pdf.gypi',

components/native_app_window.gypi

+# 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.
+{
+  'targets': [
+    {
+      'target_name': 'native_app_window',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../content/content.gyp:content_browser',
+        '../extensions/extensions.gyp:extensions_browser',
+        '../extensions/extensions.gyp:extensions_common',
+        '../skia/skia.gyp:skia',
+        '../ui/views/views.gyp:views',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'native_app_window/native_app_window_views.cc',
+        'native_app_window/native_app_window_views.h',
+      ],
+    },
+  ],
+}

components/native_app_window/BUILD.gn

+# 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.
+
+static_library("native_app_window") {
+  sources = [
+    "native_app_window_views.cc",
+    "native_app_window_views.h",
+  ]
+
+  deps = [
+    "//base",
+    "//skia",
+    "//ui/views",
+    "//content/public/browser",
+    "//extensions/browser",
+    "//extensions/common",
+  ]
+}

components/native_app_window/DEPS

+include_rules = [
+ "+base",
+ "+content/public/browser",
+ "+extensions/browser/app_window",
+ "+extensions/common",
+ "+ui/aura",
+ "+ui/gfx",
+ "+ui/views",
+ "+third_party/skia/include/core/SkRegion.h",
+]

apps/ui/views/native_app_window_views.cc → components/native_app_window/native_app_window_views.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "apps/ui/views/native_app_window_views.h"
+#include "components/native_app_window/native_app_window_views.h"
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/render_view_host.h"
@@ -22,14 +22,15 @@
 
 using extensions::AppWindow;
 
-namespace apps {
+namespace native_app_window {
 
 NativeAppWindowViews::NativeAppWindowViews()
     : app_window_(NULL),
       web_view_(NULL),
       widget_(NULL),
       frameless_(false),
-      resizable_(false) {}
+      resizable_(false) {
+}
 
 void NativeAppWindowViews::Init(AppWindow* app_window,
                                 const AppWindow::CreateParams& create_params) {
@@ -71,7 +72,9 @@ void NativeAppWindowViews::InitializeWindow(
 
 // ui::BaseWindow implementation.
 
-bool NativeAppWindowViews::IsActive() const { return widget_->IsActive(); }
+bool NativeAppWindowViews::IsActive() const {
+  return widget_->IsActive();
+}
 
 bool NativeAppWindowViews::IsMaximized() const {
   return widget_->IsMaximized();
@@ -121,19 +124,33 @@ void NativeAppWindowViews::ShowInactive() {
   widget_->ShowInactive();
 }
 
-void NativeAppWindowViews::Hide() { widget_->Hide(); }
+void NativeAppWindowViews::Hide() {
+  widget_->Hide();
+}
 
-void NativeAppWindowViews::Close() { widget_->Close(); }
+void NativeAppWindowViews::Close() {
+  widget_->Close();
+}
 
-void NativeAppWindowViews::Activate() { widget_->Activate(); }
+void NativeAppWindowViews::Activate() {
+  widget_->Activate();
+}
 
-void NativeAppWindowViews::Deactivate() { widget_->Deactivate(); }
+void NativeAppWindowViews::Deactivate() {
+  widget_->Deactivate();
+}
 
-void NativeAppWindowViews::Maximize() { widget_->Maximize(); }
+void NativeAppWindowViews::Maximize() {
+  widget_->Maximize();
+}
 
-void NativeAppWindowViews::Minimize() { widget_->Minimize(); }
+void NativeAppWindowViews::Minimize() {
+  widget_->Minimize();
+}
 
-void NativeAppWindowViews::Restore() { widget_->Restore(); }
+void NativeAppWindowViews::Restore() {
+  widget_->Restore();
+}
 
 void NativeAppWindowViews::SetBounds(const gfx::Rect& bounds) {
   widget_->SetBounds(bounds);
@@ -224,9 +241,13 @@ void NativeAppWindowViews::DeleteDelegate() {
   app_window_->OnNativeClose();
 }
 
-views::Widget* NativeAppWindowViews::GetWidget() { return widget_; }
+views::Widget* NativeAppWindowViews::GetWidget() {
+  return widget_;
+}
 
-const views::Widget* NativeAppWindowViews::GetWidget() const { return widget_; }
+const views::Widget* NativeAppWindowViews::GetWidget() const {
+  return widget_;
+}
 
 views::View* NativeAppWindowViews::GetContentsView() {
   return this;
@@ -319,9 +340,13 @@ bool NativeAppWindowViews::IsFullscreenOrPending() const {
   return widget_->IsFullscreen();
 }
 
-void NativeAppWindowViews::UpdateWindowIcon() { widget_->UpdateWindowIcon(); }
+void NativeAppWindowViews::UpdateWindowIcon() {
+  widget_->UpdateWindowIcon();
+}
 
-void NativeAppWindowViews::UpdateWindowTitle() { widget_->UpdateWindowTitle(); }
+void NativeAppWindowViews::UpdateWindowTitle() {
+  widget_->UpdateWindowTitle();
+}
 
 void NativeAppWindowViews::UpdateBadgeIcon() {
   // Stub implementation. See also ChromeNativeAppWindowViews.
@@ -351,9 +376,13 @@ void NativeAppWindowViews::HandleKeyboardEvent(
                                                         GetFocusManager());
 }
 
-bool NativeAppWindowViews::IsFrameless() const { return frameless_; }
+bool NativeAppWindowViews::IsFrameless() const {
+  return frameless_;
+}
 
-bool NativeAppWindowViews::HasFrameColor() const { return false; }
+bool NativeAppWindowViews::HasFrameColor() const {
+  return false;
+}
 
 SkColor NativeAppWindowViews::ActiveFrameColor() const {
   return SK_ColorBLACK;
@@ -378,11 +407,14 @@ gfx::Insets NativeAppWindowViews::GetFrameInsets() const {
   return window_bounds.InsetsFrom(client_bounds);
 }
 
-void NativeAppWindowViews::HideWithApp() {}
+void NativeAppWindowViews::HideWithApp() {
+}
 
-void NativeAppWindowViews::ShowWithApp() {}
+void NativeAppWindowViews::ShowWithApp() {
+}
 
-void NativeAppWindowViews::UpdateShelfMenu() {}
+void NativeAppWindowViews::UpdateShelfMenu() {
+}
 
 gfx::Size NativeAppWindowViews::GetContentMinimumSize() const {
   return size_constraints_.GetMinimumSize();
@@ -393,7 +425,8 @@ gfx::Size NativeAppWindowViews::GetContentMaximumSize() const {
 }
 
 void NativeAppWindowViews::SetContentSizeConstraints(
-    const gfx::Size& min_size, const gfx::Size& max_size) {
+    const gfx::Size& min_size,
+    const gfx::Size& max_size) {
   size_constraints_.set_minimum_size(min_size);
   size_constraints_.set_maximum_size(max_size);
   widget_->OnSizeConstraintsChanged();
@@ -407,4 +440,4 @@ void NativeAppWindowViews::SetVisibleOnAllWorkspaces(bool always_visible) {
   widget_->SetVisibleOnAllWorkspaces(always_visible);
 }
 
-}  // namespace apps
+}  // namespace native_app_window

apps/ui/views/native_app_window_views.h → components/native_app_window/native_app_window_views.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
-#define APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
+#ifndef COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_
+#define COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_
 
 #include "base/observer_list.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -37,9 +37,7 @@ class MenuRunner;
 class WebView;
 }
 
-namespace apps {
-
-class AppWindowFrameView;
+namespace native_app_window {
 
 // A NativeAppWindow backed by a views::Widget. This class may be used alone
 // as a stub or subclassed (for example, ChromeNativeAppWindowViews).
@@ -193,6 +191,6 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
 
-}  // namespace apps
+}  // namespace native_app_window
 
-#endif  // APPS_UI_VIEWS_NATIVE_APP_WINDOW_VIEWS_H_
+#endif  // COMPONENTS_NATIVE_APP_WINDOW_NATIVE_APP_WINDOW_VIEWS_H_