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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 265813008: ozone: Fix chromeos=1 use_ozone=1 chrome build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyp Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_browser_chromeos.gypi » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/browser_process_platform_part_chromeos.h" 24 #include "chrome/browser/browser_process_platform_part_chromeos.h"
25 #include "chrome/browser/chrome_notification_types.h" 25 #include "chrome/browser/chrome_notification_types.h"
26 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 26 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
27 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 27 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
28 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 28 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 29 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
30 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" 30 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"
31 #include "chrome/browser/chromeos/boot_times_loader.h" 31 #include "chrome/browser/chromeos/boot_times_loader.h"
32 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" 32 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
33 #include "chrome/browser/chromeos/events/event_rewriter.h"
33 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 34 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
34 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 35 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
35 #include "chrome/browser/chromeos/extensions/default_app_order.h" 36 #include "chrome/browser/chromeos/extensions/default_app_order.h"
36 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h" 37 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h"
37 #include "chrome/browser/chromeos/external_metrics.h" 38 #include "chrome/browser/chromeos/external_metrics.h"
38 #include "chrome/browser/chromeos/imageburner/burn_manager.h" 39 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
39 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 40 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
40 #include "chrome/browser/chromeos/input_method/input_method_util.h" 41 #include "chrome/browser/chromeos/input_method/input_method_util.h"
41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "media/audio/sounds/sounds_manager.h" 110 #include "media/audio/sounds/sounds_manager.h"
110 #include "net/base/network_change_notifier.h" 111 #include "net/base/network_change_notifier.h"
111 #include "net/url_request/url_request.h" 112 #include "net/url_request/url_request.h"
112 #include "net/url_request/url_request_context_getter.h" 113 #include "net/url_request/url_request_context_getter.h"
113 #include "ui/base/touch/touch_device.h" 114 #include "ui/base/touch/touch_device.h"
114 #include "ui/events/event_utils.h" 115 #include "ui/events/event_utils.h"
115 116
116 // Exclude X11 dependents for ozone 117 // Exclude X11 dependents for ozone
117 #if defined(USE_X11) 118 #if defined(USE_X11)
118 #include "chrome/browser/chromeos/device_uma.h" 119 #include "chrome/browser/chromeos/device_uma.h"
119 #include "chrome/browser/chromeos/events/event_rewriter.h"
120 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 120 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
121 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h" 121 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h"
122 #endif 122 #endif
123 123
124 namespace chromeos { 124 namespace chromeos {
125 125
126 namespace { 126 namespace {
127 127
128 void ChromeOSVersionCallback(const std::string& version) { 128 void ChromeOSVersionCallback(const std::string& version) {
129 base::SetLinuxDistro(std::string("CrOS ") + version); 129 base::SetLinuxDistro(std::string("CrOS ") + version);
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 // Destroy DBus services immediately after threads are stopped. 856 // Destroy DBus services immediately after threads are stopped.
857 dbus_services_.reset(); 857 dbus_services_.reset();
858 858
859 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 859 ChromeBrowserMainPartsLinux::PostDestroyThreads();
860 860
861 // Destroy DeviceSettingsService after g_browser_process. 861 // Destroy DeviceSettingsService after g_browser_process.
862 DeviceSettingsService::Shutdown(); 862 DeviceSettingsService::Shutdown();
863 } 863 }
864 864
865 } // namespace chromeos 865 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698