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

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

Issue 643103003: Use app_list_service_disabled in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/views/frame/browser_frame.cc » ('j') | 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"
(...skipping 13 matching lines...) Expand all
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
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
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/views/frame/browser_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698