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

Side by Side Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc

Issue 58853004: [win8] Force browsers created with Chrome in Metro mode to be on the Ash desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bots do not seem to care, but try not to break non-CrOS Ash on Linux. Also fix typo. Created 7 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/native_browser_frame_factory.h" 5 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/views/frame/browser_view.h" 8 #include "chrome/browser/ui/views/frame/browser_view.h"
9 9
10 #if defined(USE_ASH) 10 #if defined(USE_ASH)
11 #include "ash/wm/window_util.h" 11 #include "ash/wm/window_util.h"
12 #include "chrome/browser/ui/ash/ash_init.h" 12 #include "chrome/browser/ui/ash/ash_init.h"
13 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" 13 #include "chrome/browser/ui/views/frame/browser_frame_ash.h"
14 #endif 14 #endif
15 15
16 #if !defined(OS_CHROMEOS) 16 #if !defined(OS_CHROMEOS)
17 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" 17 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
18 #endif 18 #endif
19 19
20 #if defined(OS_WIN)
sky 2013/11/14 15:28:42 Oy, what a sea of ifdefs. I think it's time for au
tapted 2013/11/15 12:47:11 Done. Fluctuated a lot with the various permutatio
21 #include "chrome/browser/ui/views/frame/browser_frame_ash_win.h"
22 #endif
23
20 NativeBrowserFrame* NativeBrowserFrameFactory::Create( 24 NativeBrowserFrame* NativeBrowserFrameFactory::Create(
21 BrowserFrame* browser_frame, 25 BrowserFrame* browser_frame,
22 BrowserView* browser_view) { 26 BrowserView* browser_view) {
23 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
24 return new BrowserFrameAsh(browser_frame, browser_view); 28 return new BrowserFrameAsh(browser_frame, browser_view);
25 #else 29 #else
26 #if defined(USE_ASH) 30 #if defined(USE_ASH)
27 if (chrome::ShouldOpenAshOnStartup() || 31 if (chrome::ShouldOpenAshOnStartup() ||
28 browser_view->browser()-> 32 browser_view->browser()->
29 host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) { 33 host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
34 #if defined(OS_WIN)
35 return new BrowserFrameAshWin(browser_frame, browser_view);
36 #else
30 return new BrowserFrameAsh(browser_frame, browser_view); 37 return new BrowserFrameAsh(browser_frame, browser_view);
38 #endif
31 } 39 }
32 #endif // USE_ASH 40 #endif // USE_ASH
33 return new DesktopBrowserFrameAura(browser_frame, browser_view); 41 return new DesktopBrowserFrameAura(browser_frame, browser_view);
34 #endif 42 #endif
35 } 43 }
36 44
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698