chrome/browser/ui/views/status_icons/status_icon_win.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/status_icons/status_icon_win.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/omnibox/omnibox_view_win.cc ('K') | « chrome/browser/ui/views/omnibox/omnibox_view_win.cc ('k') | chrome/browser/ui/views/status_icons/status_tray_win.cc » ('j') | chrome/browser/ui/views/tabs/tab_strip.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/status_icons/status_icon_win.cc

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

index d154f59d0498ce123d5de4da3e682031ca1d1005..e095207ff84a3fac8cc4f549cf4a80dace0a1573 100644

--- a/chrome/browser/ui/views/status_icons/status_icon_win.cc

+++ b/chrome/browser/ui/views/status_icons/status_icon_win.cc

@@ -13,6 +13,7 @@

#include "ui/views/controls/menu/menu_item_view.h"

#include "ui/views/controls/menu/menu_model_adapter.h"

#include "ui/views/controls/menu/menu_runner.h"

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

////////////////////////////////////////////////////////////////////////////////

// StatusIconWin, public:

@@ -166,7 +167,7 @@ void StatusIconWin::InitIconData(NOTIFYICONDATA* icon_data) {

StatusIconMetro::StatusIconMetro(UINT id)

: id_(id) {

- DCHECK(base::win::IsMetroProcess());

+ DCHECK(win8::IsSingleWindowMetroMode());

}

StatusIconMetro::~StatusIconMetro() {