Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/frame/browser_frame_win.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_win.h" |
| 6 | 6 |
| 7 #include <dwmapi.h> | 7 #include <dwmapi.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 342 DCHECK(set_full_screen); | 342 DCHECK(set_full_screen); |
| 343 if (set_full_screen) | 343 if (set_full_screen) |
| 344 set_full_screen(fullscreen); | 344 set_full_screen(fullscreen); |
| 345 } else { | 345 } else { |
| 346 NOTREACHED() << "Failed to get metro driver module"; | 346 NOTREACHED() << "Failed to get metro driver module"; |
| 347 } | 347 } |
| 348 } | 348 } |
| 349 views::NativeWidgetWin::SetFullscreen(fullscreen); | 349 views::NativeWidgetWin::SetFullscreen(fullscreen); |
| 350 } | 350 } |
| 351 | 351 |
| 352 void BrowserFrameWin::Activate() { | |
| 353 // In Windows 8 metro mode we have only one window visible at any given time. | |
|
sky
2012/09/12 23:19:01
I don't understand why this is necessary. What hap
| |
| 354 // Calling Show here ensures that the window being activated is visible. | |
| 355 if (base::win::IsMetroProcess()) { | |
| 356 Show(); | |
| 357 } else { | |
| 358 views::NativeWidgetWin::Activate(); | |
| 359 } | |
| 360 } | |
| 361 | |
| 352 | 362 |
| 353 //////////////////////////////////////////////////////////////////////////////// | 363 //////////////////////////////////////////////////////////////////////////////// |
| 354 // BrowserFrameWin, NativeBrowserFrame implementation: | 364 // BrowserFrameWin, NativeBrowserFrame implementation: |
| 355 | 365 |
| 356 views::NativeWidget* BrowserFrameWin::AsNativeWidget() { | 366 views::NativeWidget* BrowserFrameWin::AsNativeWidget() { |
| 357 return this; | 367 return this; |
| 358 } | 368 } |
| 359 | 369 |
| 360 const views::NativeWidget* BrowserFrameWin::AsNativeWidget() const { | 370 const views::NativeWidget* BrowserFrameWin::AsNativeWidget() const { |
| 361 return this; | 371 return this; |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 623 | 633 |
| 624 //////////////////////////////////////////////////////////////////////////////// | 634 //////////////////////////////////////////////////////////////////////////////// |
| 625 // NativeBrowserFrame, public: | 635 // NativeBrowserFrame, public: |
| 626 | 636 |
| 627 // static | 637 // static |
| 628 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( | 638 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame( |
| 629 BrowserFrame* browser_frame, | 639 BrowserFrame* browser_frame, |
| 630 BrowserView* browser_view) { | 640 BrowserView* browser_view) { |
| 631 return new BrowserFrameWin(browser_frame, browser_view); | 641 return new BrowserFrameWin(browser_frame, browser_view); |
| 632 } | 642 } |
| OLD | NEW |