| 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 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 25 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" | 25 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
| 26 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
| 27 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
| 28 #include "ui/base/ime/input_method_initializer.h" | 28 #include "ui/base/ime/input_method_initializer.h" |
| 29 #include "ui/native_theme/native_theme_aura.h" | 29 #include "ui/native_theme/native_theme_aura.h" |
| 30 #include "ui/views/linux_ui/linux_ui.h" | 30 #include "ui/views/linux_ui/linux_ui.h" |
| 31 #endif | 31 #endif |
| 32 | 32 |
| 33 #if defined(USE_ASH) | 33 #if defined(USE_ASH) |
| 34 #include "chrome/browser/ui/ash/ash_init.h" | 34 #include "chrome/browser/ui/ash/ash_util.h" |
| 35 #endif // defined(USE_ASH) | 35 #endif // defined(USE_ASH) |
| 36 | 36 |
| 37 #if !defined(OS_CHROMEOS) | 37 #if !defined(OS_CHROMEOS) |
| 38 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 38 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 namespace { | 41 namespace { |
| 42 | 42 |
| 43 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 43 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
| 44 ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) { | 44 ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 chrome::MESSAGE_BOX_TYPE_WARNING); | 162 chrome::MESSAGE_BOX_TYPE_WARNING); |
| 163 | 163 |
| 164 // Avoids gpu_process_transport_factory.cc(153)] Check failed: | 164 // Avoids gpu_process_transport_factory.cc(153)] Check failed: |
| 165 // per_compositor_data_.empty() when quit is chosen. | 165 // per_compositor_data_.empty() when quit is chosen. |
| 166 base::RunLoop().RunUntilIdle(); | 166 base::RunLoop().RunUntilIdle(); |
| 167 | 167 |
| 168 exit(EXIT_FAILURE); | 168 exit(EXIT_FAILURE); |
| 169 } | 169 } |
| 170 } | 170 } |
| 171 #endif | 171 #endif |
| OLD | NEW |