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

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

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 months 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 "ash/shell.h" 7 #include "ash/shell.h"
8 #include "chrome/browser/ui/views/frame/browser_frame_ashwin.h" 8 #include "chrome/browser/ui/views/frame/browser_frame_ashwin.h"
9 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" 9 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
10 10
11 NativeBrowserFrame* NativeBrowserFrameFactory::Create( 11 NativeBrowserFrame* NativeBrowserFrameFactory::Create(
12 BrowserFrame* browser_frame, 12 BrowserFrame* browser_frame,
13 BrowserView* browser_view) { 13 BrowserView* browser_view) {
14 if (ShouldCreateForAshDesktop(browser_view)) 14 if (ShouldCreateForAshDesktop(browser_view))
15 return new BrowserFrameAshWin(browser_frame, browser_view); 15 return new BrowserFrameAshWin(browser_frame, browser_view);
16 16
17 return new DesktopBrowserFrameAura(browser_frame, browser_view); 17 return new DesktopBrowserFrameAura(browser_frame, browser_view);
18 } 18 }
19 19
20 // static 20 // static
21 chrome::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType( 21 ui::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType(
22 chrome::HostDesktopType desktop_type) { 22 ui::HostDesktopType desktop_type) {
23 if (ash::Shell::HasInstance()) 23 if (ash::Shell::HasInstance())
24 return chrome::HOST_DESKTOP_TYPE_ASH; 24 return ui::HOST_DESKTOP_TYPE_ASH;
25 25
26 return desktop_type; 26 return desktop_type;
27 } 27 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698