chrome/browser/ui/views/status_icons/status_tray_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_tray_win.cc

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

Patch Set: keep base/win/metro.h in omnibox_view_win.cc for IsTSFAwareRequired() 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

« no previous file with comments | « chrome/browser/ui/views/status_icons/status_icon_win.cc ('k') | chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 43b24b692275017eb22cdc3dbfc56194a8403270..03797c0769777f22bd7fcb3baee9ab6eaf8e72ee 100644

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

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

@@ -4,12 +4,12 @@

#include "chrome/browser/ui/views/status_icons/status_tray_win.h"

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

#include "base/win/wrapped_window_proc.h"

#include "chrome/browser/ui/views/status_icons/status_icon_win.h"

#include "chrome/common/chrome_constants.h"

#include "ui/base/win/hwnd_util.h"

#include "ui/gfx/screen.h"

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

static const UINT kStatusIconMessage = WM_APP + 1;

@@ -99,7 +99,7 @@ StatusTrayWin::~StatusTrayWin() {

}

StatusIcon* StatusTrayWin::CreatePlatformStatusIcon() {

- if (base::win::IsMetroProcess()) {

+ if (win8::IsSingleWindowMetroMode()) {

return new StatusIconMetro(next_icon_id_++);

} else {

return new StatusIconWin(next_icon_id_++, window_, kStatusIconMessage);