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/aura/chrome_browser_main_extra_parts_aura.h" | 5 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "chrome/browser/chrome_browser_main.h" | 9 #include "chrome/browser/chrome_browser_main.h" |
10 #include "chrome/browser/ui/aura/active_desktop_monitor.h" | 10 #include "chrome/browser/ui/aura/active_desktop_monitor.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 #endif | 114 #endif |
115 #endif | 115 #endif |
116 | 116 |
117 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 117 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
118 if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) | 118 if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) |
119 views::LinuxUI::instance()->Initialize(); | 119 views::LinuxUI::instance()->Initialize(); |
120 #endif | 120 #endif |
121 } | 121 } |
122 | 122 |
123 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() { | 123 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() { |
124 #if !defined(OS_CHROMEOS) | 124 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
125 #if defined(USE_ASH) | 125 #if defined(USE_ASH) |
126 if (!chrome::ShouldOpenAshOnStartup()) | 126 if (!chrome::ShouldOpenAshOnStartup()) |
127 #endif | 127 #endif |
128 { | 128 { |
129 gfx::Screen* screen = views::CreateDesktopScreen(); | 129 gfx::Screen* screen = views::CreateDesktopScreen(); |
130 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen); | 130 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen); |
131 #if defined(USE_X11) | 131 #if defined(USE_X11) |
132 views::LinuxUI::instance()->UpdateDeviceScaleFactor( | 132 views::LinuxUI::instance()->UpdateDeviceScaleFactor( |
133 screen->GetPrimaryDisplay().device_scale_factor()); | 133 screen->GetPrimaryDisplay().device_scale_factor()); |
134 #endif | 134 #endif |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 chrome::MESSAGE_BOX_TYPE_WARNING); | 172 chrome::MESSAGE_BOX_TYPE_WARNING); |
173 | 173 |
174 // Avoids gpu_process_transport_factory.cc(153)] Check failed: | 174 // Avoids gpu_process_transport_factory.cc(153)] Check failed: |
175 // per_compositor_data_.empty() when quit is chosen. | 175 // per_compositor_data_.empty() when quit is chosen. |
176 base::RunLoop().RunUntilIdle(); | 176 base::RunLoop().RunUntilIdle(); |
177 | 177 |
178 exit(EXIT_FAILURE); | 178 exit(EXIT_FAILURE); |
179 } | 179 } |
180 } | 180 } |
181 #endif | 181 #endif |
OLD | NEW |