chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc - Issue 947343003: Split out Ash/Aura parts of ChromeNativeAppWindowViews.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Ready for review. 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

« chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc ('K') | « chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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);

};