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

Side by Side Diff: chrome/browser/ui/host_desktop.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/host_desktop.h" 5 #include "chrome/browser/ui/host_desktop.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // BrowserList isn't empty. 63 // BrowserList isn't empty.
64 if ((ActiveDesktopMonitor::GetLastActivatedDesktopType() == 64 if ((ActiveDesktopMonitor::GetLastActivatedDesktopType() ==
65 chrome::HOST_DESKTOP_TYPE_ASH) && 65 chrome::HOST_DESKTOP_TYPE_ASH) &&
66 ash::Shell::HasInstance()) { 66 ash::Shell::HasInstance()) {
67 return HOST_DESKTOP_TYPE_ASH; 67 return HOST_DESKTOP_TYPE_ASH;
68 } 68 }
69 #endif 69 #endif
70 return HOST_DESKTOP_TYPE_NATIVE; 70 return HOST_DESKTOP_TYPE_NATIVE;
71 } 71 }
72 72
73 HostDesktopType GetVerifiedHostDesktopForBrowser(HostDesktopType desktop_type) {
74 #if defined(USE_ASH) && defined(OS_WIN)
75 if (ash::Shell::HasInstance())
76 return chrome::HOST_DESKTOP_TYPE_ASH;
Shrikant Kelkar 2013/11/14 23:54:23 I doubt if this will work when we have both ASH an
tapted 2013/11/15 00:11:51 Yes that's correct. This function is to capture th
77
78 #endif
79 return desktop_type;
80 }
81
73 } // namespace chrome 82 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698