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

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.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/tabs/tab.cc ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_strip.cc
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 871f843f695ed2606d8be327dfbc7e171c62f0d3..df3b3ccaf2c319e27447931de289b13049fbf72c 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -51,9 +51,9 @@
#include "ui/views/window/non_client_view.h"
#if defined(OS_WIN)
-#include "base/win/metro.h"
#include "ui/base/win/hwnd_util.h"
#include "ui/views/widget/monitor_win.h"
+#include "win8/util/win8_util.h"
#endif
using content::UserMetricsAction;
@@ -401,7 +401,7 @@ gfx::ImageSkia NewTabButton::GetBackgroundImage(
} else if (tab_strip_->controller()->IsIncognito()) {
background_id = IDR_THEME_TAB_BACKGROUND_INCOGNITO;
#if defined(OS_WIN)
- } else if (base::win::IsMetroProcess()) {
+ } else if (win8::IsSingleWindowMetroMode()) {
background_id = IDR_THEME_TAB_BACKGROUND_V;
#endif
} else {
@@ -1062,8 +1062,8 @@ void TabStrip::MaybeStartDrag(
move_behavior = TabDragController::MOVE_VISIBILE_TABS;
}
#if defined(OS_WIN)
- // It doesn't make sense to drag tabs out on metro.
- if (base::win::IsMetroProcess())
+ // It doesn't make sense to drag tabs out on Win8's single window Metro mode.
+ if (win8::IsSingleWindowMetroMode())
detach_behavior = TabDragController::NOT_DETACHABLE;
#endif
// Gestures don't automatically do a capture. We don't allow multiple drags at
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698