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

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

Issue 1212163011: Componentize chrome/browser/rlz (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 5 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
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 68 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
69 #include "chrome/browser/chromeos/settings/device_settings_service.h" 69 #include "chrome/browser/chromeos/settings/device_settings_service.h"
70 #include "chrome/browser/chromeos/status/data_promo_notification.h" 70 #include "chrome/browser/chromeos/status/data_promo_notification.h"
71 #include "chrome/browser/chromeos/system/input_device_settings.h" 71 #include "chrome/browser/chromeos/system/input_device_settings.h"
72 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 72 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
73 #include "chrome/browser/defaults.h" 73 #include "chrome/browser/defaults.h"
74 #include "chrome/browser/lifetime/application_lifetime.h" 74 #include "chrome/browser/lifetime/application_lifetime.h"
75 #include "chrome/browser/net/chrome_network_delegate.h" 75 #include "chrome/browser/net/chrome_network_delegate.h"
76 #include "chrome/browser/profiles/profile.h" 76 #include "chrome/browser/profiles/profile.h"
77 #include "chrome/browser/profiles/profile_manager.h" 77 #include "chrome/browser/profiles/profile_manager.h"
78 #include "chrome/browser/rlz/rlz.h"
79 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h" 78 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h"
80 #include "chrome/common/chrome_constants.h" 79 #include "chrome/common/chrome_constants.h"
81 #include "chrome/common/chrome_paths.h" 80 #include "chrome/common/chrome_paths.h"
82 #include "chrome/common/chrome_switches.h" 81 #include "chrome/common/chrome_switches.h"
83 #include "chrome/common/chrome_version_info.h" 82 #include "chrome/common/chrome_version_info.h"
84 #include "chrome/common/logging_chrome.h" 83 #include "chrome/common/logging_chrome.h"
85 #include "chrome/common/pref_names.h" 84 #include "chrome/common/pref_names.h"
86 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 85 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
87 #include "chromeos/audio/cras_audio_handler.h" 86 #include "chromeos/audio/cras_audio_handler.h"
88 #include "chromeos/cert_loader.h" 87 #include "chromeos/cert_loader.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 #include "media/audio/sounds/sounds_manager.h" 121 #include "media/audio/sounds/sounds_manager.h"
123 #include "net/base/network_change_notifier.h" 122 #include "net/base/network_change_notifier.h"
124 #include "net/socket/ssl_server_socket.h" 123 #include "net/socket/ssl_server_socket.h"
125 #include "net/url_request/url_request.h" 124 #include "net/url_request/url_request.h"
126 #include "net/url_request/url_request_context_getter.h" 125 #include "net/url_request/url_request_context_getter.h"
127 #include "ui/base/ime/chromeos/ime_keyboard.h" 126 #include "ui/base/ime/chromeos/ime_keyboard.h"
128 #include "ui/base/ime/chromeos/input_method_manager.h" 127 #include "ui/base/ime/chromeos/input_method_manager.h"
129 #include "ui/base/touch/touch_device.h" 128 #include "ui/base/touch/touch_device.h"
130 #include "ui/events/event_utils.h" 129 #include "ui/events/event_utils.h"
131 130
131 #if defined(ENABLE_RLZ)
132 #include "components/rlz/rlz_tracker.h"
133 #endif
134
132 // Exclude X11 dependents for ozone 135 // Exclude X11 dependents for ozone
133 #if defined(USE_X11) 136 #if defined(USE_X11)
134 #include "chrome/browser/chromeos/device_uma.h" 137 #include "chrome/browser/chromeos/device_uma.h"
135 #include "chrome/browser/chromeos/events/system_key_event_listener.h" 138 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
136 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h" 139 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener .h"
137 #endif 140 #endif
138 141
139 namespace chromeos { 142 namespace chromeos {
140 143
141 namespace { 144 namespace {
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 // Destroy DBus services immediately after threads are stopped. 773 // Destroy DBus services immediately after threads are stopped.
771 dbus_services_.reset(); 774 dbus_services_.reset();
772 775
773 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 776 ChromeBrowserMainPartsLinux::PostDestroyThreads();
774 777
775 // Destroy DeviceSettingsService after g_browser_process. 778 // Destroy DeviceSettingsService after g_browser_process.
776 DeviceSettingsService::Shutdown(); 779 DeviceSettingsService::Shutdown();
777 } 780 }
778 781
779 } // namespace chromeos 782 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698