OLD | NEW |
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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/ui/ash/network_connect_delegate_chromeos.h" | 78 #include "chrome/browser/ui/ash/network_connect_delegate_chromeos.h" |
| 79 #include "chrome/common/channel_info.h" |
79 #include "chrome/common/chrome_constants.h" | 80 #include "chrome/common/chrome_constants.h" |
80 #include "chrome/common/chrome_paths.h" | 81 #include "chrome/common/chrome_paths.h" |
81 #include "chrome/common/chrome_switches.h" | 82 #include "chrome/common/chrome_switches.h" |
82 #include "chrome/common/chrome_version_info.h" | |
83 #include "chrome/common/logging_chrome.h" | 83 #include "chrome/common/logging_chrome.h" |
84 #include "chrome/common/pref_names.h" | 84 #include "chrome/common/pref_names.h" |
85 #include "chromeos/audio/audio_devices_pref_handler_impl.h" | 85 #include "chromeos/audio/audio_devices_pref_handler_impl.h" |
86 #include "chromeos/audio/cras_audio_handler.h" | 86 #include "chromeos/audio/cras_audio_handler.h" |
87 #include "chromeos/cert_loader.h" | 87 #include "chromeos/cert_loader.h" |
88 #include "chromeos/chromeos_paths.h" | 88 #include "chromeos/chromeos_paths.h" |
89 #include "chromeos/chromeos_switches.h" | 89 #include "chromeos/chromeos_switches.h" |
90 #include "chromeos/cryptohome/async_method_caller.h" | 90 #include "chromeos/cryptohome/async_method_caller.h" |
91 #include "chromeos/cryptohome/homedir_methods.h" | 91 #include "chromeos/cryptohome/homedir_methods.h" |
92 #include "chromeos/cryptohome/system_salt_getter.h" | 92 #include "chromeos/cryptohome/system_salt_getter.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 } | 289 } |
290 LOG(WARNING) << "Running as stub user with profile dir: " | 290 LOG(WARNING) << "Running as stub user with profile dir: " |
291 << singleton_command_line->GetSwitchValuePath( | 291 << singleton_command_line->GetSwitchValuePath( |
292 switches::kLoginProfile).value(); | 292 switches::kLoginProfile).value(); |
293 } | 293 } |
294 | 294 |
295 #if defined(GOOGLE_CHROME_BUILD) | 295 #if defined(GOOGLE_CHROME_BUILD) |
296 const char kChromeOSReleaseTrack[] = "CHROMEOS_RELEASE_TRACK"; | 296 const char kChromeOSReleaseTrack[] = "CHROMEOS_RELEASE_TRACK"; |
297 std::string channel; | 297 std::string channel; |
298 if (base::SysInfo::GetLsbReleaseValue(kChromeOSReleaseTrack, &channel)) | 298 if (base::SysInfo::GetLsbReleaseValue(kChromeOSReleaseTrack, &channel)) |
299 chrome::VersionInfo::SetChannel(channel); | 299 chrome::SetChannel(channel); |
300 #endif | 300 #endif |
301 | 301 |
302 ChromeBrowserMainPartsLinux::PreEarlyInitialization(); | 302 ChromeBrowserMainPartsLinux::PreEarlyInitialization(); |
303 } | 303 } |
304 | 304 |
305 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() { | 305 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() { |
306 // Replace the default NetworkChangeNotifierFactory with ChromeOS specific | 306 // Replace the default NetworkChangeNotifierFactory with ChromeOS specific |
307 // implementation. This must be done before BrowserMainLoop calls | 307 // implementation. This must be done before BrowserMainLoop calls |
308 // net::NetworkChangeNotifier::Create() in MainMessageLoopStart(). | 308 // net::NetworkChangeNotifier::Create() in MainMessageLoopStart(). |
309 net::NetworkChangeNotifier::SetFactory( | 309 net::NetworkChangeNotifier::SetFactory( |
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
773 // Destroy DBus services immediately after threads are stopped. | 773 // Destroy DBus services immediately after threads are stopped. |
774 dbus_services_.reset(); | 774 dbus_services_.reset(); |
775 | 775 |
776 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 776 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
777 | 777 |
778 // Destroy DeviceSettingsService after g_browser_process. | 778 // Destroy DeviceSettingsService after g_browser_process. |
779 DeviceSettingsService::Shutdown(); | 779 DeviceSettingsService::Shutdown(); |
780 } | 780 } |
781 | 781 |
782 } // namespace chromeos | 782 } // namespace chromeos |
OLD | NEW |