| 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 "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/chrome_browser_main.h" | 10 #include "chrome/browser/chrome_browser_main.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 views::LinuxUI::SetInstance(gtk2_ui); | 97 views::LinuxUI::SetInstance(gtk2_ui); |
| 98 #endif | 98 #endif |
| 99 } | 99 } |
| 100 | 100 |
| 101 void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() { | 101 void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() { |
| 102 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 102 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| 103 views::LinuxUI::instance()->Initialize(); | 103 views::LinuxUI::instance()->Initialize(); |
| 104 #endif | 104 #endif |
| 105 } | 105 } |
| 106 | 106 |
| 107 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() { | 107 void ChromeBrowserMainExtraPartsAura::PreCreateThreadsBegin() { |
| 108 #if !defined(OS_CHROMEOS) | 108 #if !defined(OS_CHROMEOS) |
| 109 #if defined(USE_ASH) | 109 #if defined(USE_ASH) |
| 110 bool should_open_ash = chrome::ShouldOpenAshOnStartup(); | 110 bool should_open_ash = chrome::ShouldOpenAshOnStartup(); |
| 111 #else | 111 #else |
| 112 bool should_open_ash = false; | 112 bool should_open_ash = false; |
| 113 #endif | 113 #endif |
| 114 if (!should_open_ash) { | 114 if (!should_open_ash) { |
| 115 gfx::Screen* screen = views::CreateDesktopScreen(); | 115 gfx::Screen* screen = views::CreateDesktopScreen(); |
| 116 gfx::Screen::SetScreenInstance(screen); | 116 gfx::Screen::SetScreenInstance(screen); |
| 117 #if defined(USE_X11) | 117 #if defined(USE_X11) |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 chrome::MESSAGE_BOX_TYPE_WARNING); | 156 chrome::MESSAGE_BOX_TYPE_WARNING); |
| 157 | 157 |
| 158 // Avoids gpu_process_transport_factory.cc(153)] Check failed: | 158 // Avoids gpu_process_transport_factory.cc(153)] Check failed: |
| 159 // per_compositor_data_.empty() when quit is chosen. | 159 // per_compositor_data_.empty() when quit is chosen. |
| 160 base::RunLoop().RunUntilIdle(); | 160 base::RunLoop().RunUntilIdle(); |
| 161 | 161 |
| 162 exit(EXIT_FAILURE); | 162 exit(EXIT_FAILURE); |
| 163 } | 163 } |
| 164 } | 164 } |
| 165 #endif | 165 #endif |
| OLD | NEW |