Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_view.cc |
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
| index 3abbf3be38411e537d543437546bdeb14b521b28..df461ee6629dfede2a2e36ddee51ace84ea18c3d 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.cc |
| +++ b/chrome/browser/ui/views/frame/browser_view.cc |
| @@ -1313,7 +1313,7 @@ WindowOpenDisposition BrowserView::GetDispositionForPopupBounds( |
| return NEW_POPUP; |
| #else |
| // If we are in windows metro-mode, we can't allow popup windows. |
| - return (base::win::GetMetroModule() == NULL) ? NEW_POPUP : NEW_BACKGROUND_TAB; |
| + return base::win::InMetroMode() ? NEW_BACKGROUND_TAB : NEW_POPUP; |
| #endif |
| #else |
| return NEW_POPUP; |
| @@ -1489,7 +1489,7 @@ bool BrowserView::ExecuteWindowsCommand(int command_id) { |
| GetWidget()->DebugToggleFrameType(); |
| // In Windows 8 metro mode prevent sizing and moving. |
| - if (base::win::GetMetroModule()) { |
| + if (base::win::InMetroMode()) { |
| // Windows uses the 4 lower order bits of |notification_code| for type- |
| // specific information so we must exclude this when comparing. |
| static const int sc_mask = 0xFFF0; |
| @@ -1805,7 +1805,7 @@ int BrowserView::GetOTRIconResourceID() const { |
| if (IsFullscreen()) |
| otr_resource_id = IDR_OTR_ICON_FULLSCREEN; |
| #if defined(OS_WIN) && !defined(USE_AURA) |
| - if (base::win::GetMetroModule() != NULL) |
| + if (base::win::InMetroMode() != NULL) |
|
ananta
2012/06/15 21:46:19
remove != NULL
Sigurður Ásgeirsson
2012/06/18 13:54:15
Done.
|
| otr_resource_id = IDR_OTR_ICON_FULLSCREEN; |
| #endif |
| } |