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

Unified Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 211133005: [WIP] Not for review. Zero copy. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
index 259b07363833b1f64c1115e349905d1f4cf2a983..e84c7951c1c25a133278de6db09e8f491b987ea4 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
@@ -62,10 +62,11 @@ ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {
}
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_ASH)
+#if !defined(OS_CHROMEOS)
// Returns the desktop this process was initially launched in.
chrome::HostDesktopType GetInitialDesktop() {
-#if defined(OS_WIN) && defined(USE_ASH)
+#if defined(USE_ASH)
+#if defined(OS_WIN)
const CommandLine* command_line = CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kViewerConnect) ||
command_line->HasSwitch(switches::kViewerLaunchViaAppId)) {
@@ -76,6 +77,7 @@ chrome::HostDesktopType GetInitialDesktop() {
if (command_line->HasSwitch(switches::kOpenAsh))
return chrome::HOST_DESKTOP_TYPE_ASH;
#endif
+#endif
return chrome::HOST_DESKTOP_TYPE_NATIVE;
}
« no previous file with comments | « chrome/browser/lifetime/application_lifetime_aura.cc ('k') | chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698