Move native_app_window_views* to components/native_app_window and fixed up build files.
This will be used in athena.
BUG=414968
[email protected]
Review URL: https://codereview.chromium.org/576863003
Cr-Commit-Position: refs/heads/master@{#295502}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index a70a1ee..2c17f10f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -69,6 +69,7 @@
"//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 @@
#"app_shim" TODO(GYP)
]
}
+ if (!toolkit_views) {
+ deps -= [ "//components/native_app_window" ]
+ }
if (cld2_data_source == "component") {
sources += [
"component_updater/cld_component_installer.cc",
diff --git a/chrome/browser/chromeos/login/DEPS b/chrome/browser/chromeos/login/DEPS
index 523c5d51..f2d9c14 100644
--- a/chrome/browser/chromeos/login/DEPS
+++ b/chrome/browser/chromeos/login/DEPS
@@ -4,6 +4,7 @@
"+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.
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index cfe46d3b..f6c3d8c 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/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 @@
"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);
diff --git a/chrome/browser/ui/views/apps/DEPS b/chrome/browser/ui/views/apps/DEPS
new file mode 100644
index 0000000..ccbb8b0
--- /dev/null
+++ b/chrome/browser/ui/views/apps/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+components/native_app_window"
+]
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h b/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
index f110755..f5d63359 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.h
+++ b/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 @@
class MenuRunner;
}
-class ChromeNativeAppWindowViews : public apps::NativeAppWindowViews,
- public views::ContextMenuController {
+class ChromeNativeAppWindowViews
+ : public native_app_window::NativeAppWindowViews,
+ public views::ContextMenuController {
public:
ChromeNativeAppWindowViews();
virtual ~ChromeNativeAppWindowViews();
