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

Unified Diff: chrome/browser/browser_process_platform_part_chromeos.cc

Issue 2166503003: Fix bluetooth adapter access in SystemTrayDelegateChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Do not check on InputMethodManager::Get. Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_process_platform_part_chromeos.cc
diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc
index 6383a8526ea42a10f166c47cb43b8a185b37bea9..0369f1444a951e3dc2fd006bb1fdd10421814e80 100644
--- a/chrome/browser/browser_process_platform_part_chromeos.cc
+++ b/chrome/browser/browser_process_platform_part_chromeos.cc
@@ -31,11 +31,9 @@
#include "components/user_manager/user_manager.h"
BrowserProcessPlatformPart::BrowserProcessPlatformPart()
- : created_profile_helper_(false) {
-}
+ : created_profile_helper_(false) {}
-BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {
-}
+BrowserProcessPlatformPart::~BrowserProcessPlatformPart() {}
void BrowserProcessPlatformPart::InitializeAutomaticRebootManager() {
DCHECK(!automatic_reboot_manager_);
@@ -142,12 +140,6 @@ chromeos::TimeZoneResolver* BrowserProcessPlatformPart::GetTimezoneResolver() {
return timezone_resolver_.get();
}
-chromeos::system::SystemClock* BrowserProcessPlatformPart::GetSystemClock() {
- if (!system_clock_.get())
- system_clock_.reset(new chromeos::system::SystemClock());
-
- return system_clock_.get();
-}
void BrowserProcessPlatformPart::StartTearDown() {
// interactive_ui_tests check for memory leaks before this object is
// destroyed. So we need to destroy |timezone_resolver_| here.
@@ -161,6 +153,16 @@ BrowserProcessPlatformPart::CreateBrowserPolicyConnector() {
new policy::BrowserPolicyConnectorChromeOS());
}
+chromeos::system::SystemClock* BrowserProcessPlatformPart::GetSystemClock() {
+ if (!system_clock_.get())
+ system_clock_.reset(new chromeos::system::SystemClock());
+ return system_clock_.get();
+}
+
+void BrowserProcessPlatformPart::DestroySystemClock() {
+ system_clock_.reset();
+}
+
void BrowserProcessPlatformPart::CreateProfileHelper() {
DCHECK(!created_profile_helper_ && !profile_helper_);
created_profile_helper_ = true;

Powered by Google App Engine
This is Rietveld 408576698