Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 1015323002: gtk2_ui.h should be included only for X11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "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(USE_X11) && !defined(OS_CHROMEOS) 22 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
23 #include "base/prefs/pref_service.h" 23 #include "base/prefs/pref_service.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
26 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
27 #include "ui/aura/window.h" 26 #include "ui/aura/window.h"
28 #include "ui/base/ime/input_method_initializer.h" 27 #include "ui/base/ime/input_method_initializer.h"
29 #include "ui/native_theme/native_theme_aura.h" 28 #include "ui/native_theme/native_theme_aura.h"
30 #include "ui/views/linux_ui/linux_ui.h" 29 #include "ui/views/linux_ui/linux_ui.h"
31 #endif 30 #endif
32 31
32 #if defined(USE_X11) && !defined(OS_CHROMEOS)
33 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
34 #endif
35
33 #if defined(USE_ASH) 36 #if defined(USE_ASH)
34 #include "chrome/browser/ui/ash/ash_util.h" 37 #include "chrome/browser/ui/ash/ash_util.h"
35 #endif // defined(USE_ASH) 38 #endif // defined(USE_ASH)
36 39
37 #if !defined(OS_CHROMEOS) 40 #if !defined(OS_CHROMEOS)
38 #include "ui/views/widget/desktop_aura/desktop_screen.h" 41 #include "ui/views/widget/desktop_aura/desktop_screen.h"
39 #endif 42 #endif
40 43
41 namespace { 44 namespace {
42 45
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 chrome::MESSAGE_BOX_TYPE_WARNING); 168 chrome::MESSAGE_BOX_TYPE_WARNING);
166 169
167 // Avoids gpu_process_transport_factory.cc(153)] Check failed: 170 // Avoids gpu_process_transport_factory.cc(153)] Check failed:
168 // per_compositor_data_.empty() when quit is chosen. 171 // per_compositor_data_.empty() when quit is chosen.
169 base::RunLoop().RunUntilIdle(); 172 base::RunLoop().RunUntilIdle();
170 173
171 exit(EXIT_FAILURE); 174 exit(EXIT_FAILURE);
172 } 175 }
173 } 176 }
174 #endif 177 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698