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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "base/win/metro.h" | 8 #include "base/win/metro.h" |
9 #include "chrome/browser/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/browser/ui/browser_commands.h" | 11 #include "chrome/browser/ui/browser_commands.h" |
12 #include "chrome/browser/ui/browser_finder.h" | 12 #include "chrome/browser/ui/browser_finder.h" |
13 #include "chrome/browser/ui/browser_tabstrip.h" | 13 #include "chrome/browser/ui/browser_tabstrip.h" |
14 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" | 14 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" |
15 #include "win8/util/win8_util.h" | 15 #include "win8/util/win8_util.h" |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 void NewWindowMaybeMetro(Browser* source_browser, Profile* profile) { | 19 void NewWindowMaybeMetro(Browser* source_browser, Profile* profile) { |
20 chrome::HostDesktopType host_desktop_type = | 20 chrome::HostDesktopType host_desktop_type = |
21 source_browser->host_desktop_type(); | 21 source_browser->host_desktop_type(); |
22 if (win8::IsSingleWindowMetroMode()) { | 22 if (win8::IsSingleWindowMetroMode()) { |
23 typedef void (*FlipFrameWindows)(); | 23 typedef void (*FlipFrameWindows)(); |
24 | 24 |
25 static FlipFrameWindows flip_window_fn = reinterpret_cast<FlipFrameWindows>( | 25 static FlipFrameWindows flip_window_fn = reinterpret_cast<FlipFrameWindows>( |
26 ::GetProcAddress(base::win::GetMetroModule(), "FlipFrameWindows")); | 26 ::GetProcAddress(base::win::GetMetroModule(), "FlipFrameWindows")); |
27 DCHECK(flip_window_fn); | 27 DCHECK(flip_window_fn); |
28 | 28 |
29 Browser* browser = | 29 Browser* browser = chrome::FindTabbedBrowser(profile, false, |
30 browser::FindTabbedBrowser(profile, false, host_desktop_type); | 30 host_desktop_type); |
31 | 31 |
32 if (!browser) { | 32 if (!browser) { |
33 chrome::OpenEmptyWindow(profile); | 33 chrome::OpenEmptyWindow(profile); |
34 return; | 34 return; |
35 } | 35 } |
36 | 36 |
37 chrome::NewTab(browser); | 37 chrome::NewTab(browser); |
38 | 38 |
39 if (browser != source_browser) { | 39 if (browser != source_browser) { |
40 // Tell the metro_driver to flip our window. This causes the current | 40 // Tell the metro_driver to flip our window. This causes the current |
(...skipping 15 matching lines...) Expand all Loading... |
56 | 56 |
57 void NewIncognitoWindow(Browser* browser) { | 57 void NewIncognitoWindow(Browser* browser) { |
58 NewWindowMaybeMetro(browser, browser->profile()->GetOffTheRecordProfile()); | 58 NewWindowMaybeMetro(browser, browser->profile()->GetOffTheRecordProfile()); |
59 } | 59 } |
60 | 60 |
61 } // namespace chrome | 61 } // namespace chrome |
62 | 62 |
63 void Browser::SetMetroSnapMode(bool enable) { | 63 void Browser::SetMetroSnapMode(bool enable) { |
64 fullscreen_controller_->SetMetroSnapMode(enable); | 64 fullscreen_controller_->SetMetroSnapMode(enable); |
65 } | 65 } |
OLD | NEW |