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" |
11 #include "chrome/browser/ui/host_desktop.h" | 11 #include "chrome/browser/ui/host_desktop.h" |
12 #include "chrome/browser/ui/simple_message_box.h" | 12 #include "chrome/browser/ui/simple_message_box.h" |
13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
14 #include "chrome/grit/chromium_strings.h" | 14 #include "chrome/grit/chromium_strings.h" |
15 #include "chrome/grit/generated_resources.h" | 15 #include "chrome/grit/generated_resources.h" |
16 #include "ui/aura/env.h" | 16 #include "ui/aura/env.h" |
17 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
18 #include "ui/base/ui_base_switches.h" | 18 #include "ui/base/ui_base_switches.h" |
19 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
20 #include "ui/views/widget/native_widget_aura.h" | 20 #include "ui/views/widget/native_widget_aura.h" |
21 | 21 |
22 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 22 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
23 #include "base/prefs/pref_service.h" | |
24 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/themes/theme_service.h" | 24 #include "chrome/browser/themes/theme_service.h" |
26 #include "chrome/browser/themes/theme_service_factory.h" | 25 #include "chrome/browser/themes/theme_service_factory.h" |
27 #include "chrome/browser/ui/views/frame/browser_view.h" | 26 #include "chrome/browser/ui/views/frame/browser_view.h" |
28 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
| 28 #include "components/prefs/pref_service.h" |
29 #include "ui/aura/window.h" | 29 #include "ui/aura/window.h" |
30 #include "ui/base/ime/input_method_initializer.h" | 30 #include "ui/base/ime/input_method_initializer.h" |
31 #include "ui/native_theme/native_theme_aura.h" | 31 #include "ui/native_theme/native_theme_aura.h" |
32 #include "ui/native_theme/native_theme_dark_aura.h" | 32 #include "ui/native_theme/native_theme_dark_aura.h" |
33 #include "ui/views/linux_ui/linux_ui.h" | 33 #include "ui/views/linux_ui/linux_ui.h" |
34 #endif | 34 #endif |
35 | 35 |
36 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 36 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
37 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" | 37 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
38 #endif | 38 #endif |
(...skipping 117 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 |