Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5063)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_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/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.cc
index ffe710646b1fc935ca432681e8ed1732fdc6a355..72cf69a38263006d3ea9810ac03ebc0d1840a373 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.h"
-#include "base/win/metro.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/profiles/profile.h"
@@ -18,6 +17,7 @@
#include "content/public/browser/web_contents.h"
#include "grit/generated_resources.h"
#include "ui/views/widget/widget.h"
+#include "win8/util/win8_util.h"
using content::OpenURLParams;
using content::UserMetricsAction;
@@ -94,7 +94,7 @@ BookmarkContextMenuControllerViewsWin
}
void BookmarkContextMenuControllerViewsWin::ExecuteCommand(int id) {
- if (base::win::IsMetroProcess()) {
+ if (win8::IsSingleWindowMetroMode()) {
switch (id) {
// We need to handle the open in new window and open in incognito window
// commands to ensure that they first look for an existing browser object
@@ -150,7 +150,7 @@ void BookmarkContextMenuControllerViewsWin::ExecuteCommand(int id) {
bool BookmarkContextMenuControllerViewsWin::IsCommandEnabled(int id) const {
// In Windows 8 metro mode no new window option on a regular chrome window
// and no new incognito window option on an incognito chrome window.
- if (base::win::IsMetroProcess()) {
+ if (win8::IsSingleWindowMetroMode()) {
if (id == IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW &&
!profile()->IsOffTheRecord()) {
return false;
« no previous file with comments | « chrome/browser/ui/toolbar/wrench_menu_model.cc ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698