chrome/browser/ui/views/constrained_window_views.cc - Issue 9701002: Aura/ash split: Split the extra parts into ash and aura parts.

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

Issue 9701002: Aura/ash split: Split the extra parts into ash and aura parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to trunk to try again Created 8 years, 9 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/constrained_window_views.cc

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

index 6099e9cd4ba6ced123a962398282c50ac6a34d7c..d9ec2f4b6ad11e73d9f06ceab63c973926bb453f 100644

--- a/chrome/browser/ui/views/constrained_window_views.cc

+++ b/chrome/browser/ui/views/constrained_window_views.cc

@@ -46,7 +46,7 @@

#include "ui/views/widget/native_widget_win.h"

#endif

-#if defined(USE_AURA)

+#if defined(USE_ASH)

#include "ash/ash_switches.h"

#include "ash/shell.h"

#include "ash/wm/custom_frame_view_ash.h"

@@ -627,7 +627,7 @@ gfx::NativeWindow ConstrainedWindowViews::GetNativeWindow() {

// ConstrainedWindowViews, views::Widget overrides:

views::NonClientFrameView* ConstrainedWindowViews::CreateNonClientFrameView() {

-#if defined(USE_AURA)

+#if defined(USE_ASH)

CommandLine* command_line = CommandLine::ForCurrentProcess();

if (command_line->HasSwitch(ash::switches::kAuraGoogleDialogFrames))

return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(this);

« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller2.cc » ('j') | no next file with comments »