Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Unified Diff: chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc

Issue 947343003: Split out Ash/Aura parts of ChromeNativeAppWindowViews. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments, retain UpdateShape behavior. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
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 4aa75e2afa172f4c706846b1012135d2d7a26a47..f2a5304e103b87958a9fc287aeb4150cdae9c7ab 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
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h"
#include "apps/ui/views/app_window_frame_view.h"
-#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
+#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -25,7 +25,7 @@ class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
views::Widget* widget() { return widget_.get(); }
extensions::NativeAppWindow* app_window() { return &app_window_; }
- ChromeNativeAppWindowViews* app_window_views() { return &app_window_; }
+ ChromeNativeAppWindowViewsAura* app_window_views() { return &app_window_; }
protected:
void SetUp() override {
@@ -53,7 +53,7 @@ class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
private:
views::WebView web_view_;
scoped_ptr<views::Widget> widget_;
- ChromeNativeAppWindowViews app_window_;
+ ChromeNativeAppWindowViewsAura app_window_;
DISALLOW_COPY_AND_ASSIGN(ShapedAppWindowTargeterTest);
};

Powered by Google App Engine
This is Rietveld 408576698