chrome/browser/ui/views/apps/chrome_native_app_window_views.cc - Issue 246633004: Remove non USE_AURA code from views files.

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/chrome_native_app_window_views.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT and throw away conflicting files; I'll redo them in another patch. Created 6 years, 8 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:

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

index 6a7bbd873dcd2c29e918fa8900de1e5c9444f8a4..696160341156ed3e21f1c7999f2e2395aa9fac11 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

@@ -18,6 +18,7 @@

#include "chrome/browser/web_applications/web_app.h"

#include "chrome/common/chrome_switches.h"

#include "extensions/common/extension.h"

+#include "ui/aura/window.h"

#include "ui/base/hit_test.h"

#include "ui/base/models/simple_menu_model.h"

#include "ui/gfx/image/image_skia.h"

@@ -50,10 +51,6 @@

#include "ui/aura/window_observer.h"

#endif

-#if defined(USE_AURA)

-#include "ui/aura/window.h"

-#endif

using apps::AppWindow;

namespace {