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" |
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 "grit/chromium_strings.h" | 14 #include "grit/chromium_strings.h" |
15 #include "grit/generated_resources.h" | 15 #include "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/gfx/screen.h" | 18 #include "ui/gfx/screen.h" |
19 #include "ui/views/widget/native_widget_aura.h" | 19 #include "ui/views/widget/native_widget_aura.h" |
20 | 20 |
21 #if defined(OS_LINUX) | 21 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
22 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" | 22 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
23 #include "ui/views/linux_ui/linux_ui.h" | 23 #include "ui/views/linux_ui/linux_ui.h" |
24 #else | 24 #else |
25 #endif | 25 #endif |
26 | 26 |
27 #if defined(USE_ASH) | 27 #if defined(USE_ASH) |
28 #include "chrome/browser/ui/ash/ash_init.h" | 28 #include "chrome/browser/ui/ash/ash_init.h" |
29 #if defined(OS_WIN) | 29 #if defined(OS_WIN) |
30 #include "base/command_line.h" | 30 #include "base/command_line.h" |
31 #include "chrome/common/chrome_switches.h" | 31 #include "chrome/common/chrome_switches.h" |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 chrome::MESSAGE_BOX_TYPE_WARNING); | 127 chrome::MESSAGE_BOX_TYPE_WARNING); |
128 | 128 |
129 // Avoids gpu_process_transport_factory.cc(153)] Check failed: | 129 // Avoids gpu_process_transport_factory.cc(153)] Check failed: |
130 // per_compositor_data_.empty() when quit is chosen. | 130 // per_compositor_data_.empty() when quit is chosen. |
131 base::RunLoop().RunUntilIdle(); | 131 base::RunLoop().RunUntilIdle(); |
132 | 132 |
133 exit(EXIT_FAILURE); | 133 exit(EXIT_FAILURE); |
134 } | 134 } |
135 } | 135 } |
136 #endif | 136 #endif |
OLD | NEW |