chrome/browser/ui/views/frame/opaque_browser_frame_view.cc - Issue 11411286: Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

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/frame/opaque_browser_frame_view.cc

Issue 11411286: Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge up to r170746 Created 8 years 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/frame/browser_view.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/hung_renderer_view_win.cc » ('j') | chrome/browser/ui/views/hung_renderer_view_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

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

index ea37da02b200e463ddea4ef2439c226440b44131..a05c927c9b960ddbe3359d4c41fff55fb5ae2243 100644

--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

@@ -45,7 +45,7 @@

#include "ui/views/window/window_shape.h"

#if defined(OS_WIN)

-#include "base/win/metro.h"

+#include "win8/util/win8_util.h"

#endif // OS_WIN

using content::WebContents;

@@ -118,8 +118,8 @@ bool ConvertedContainsCheck(gfx::Rect bounds, const views::View* src,

}

bool ShouldAddDefaultCaptionButtons() {

-#if defined(OS_WIN) && !defined(USE_AURA)

- return !base::win::IsMetroProcess();

+#if defined(OS_WIN)

cpu_(ooo_6.6-7.5) 2012/12/03 20:56:26 not familiar with this particular change, consider

gab 2012/12/04 00:19:06 Given it already had #if !defined(USE_AURA); this

+ return !win8::IsSingleWindowMetroMode();

#endif // OS_WIN

return true;

}