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: components/proximity_auth/screenlock_bridge.cc

Issue 2733283002: Require explicit selection of traits for LazyInstance (Closed)
Patch Set: Created 3 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/proximity_auth/screenlock_bridge.h" 5 #include "components/proximity_auth/screenlock_bridge.h"
6 6
7 #include "base/strings/string16.h" 7 #include "base/strings/string16.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "components/proximity_auth/logging/logging.h" 9 #include "components/proximity_auth/logging/logging.h"
10 10
11 #if defined(OS_CHROMEOS) 11 #if defined(OS_CHROMEOS)
12 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "chromeos/dbus/session_manager_client.h" 13 #include "chromeos/dbus/session_manager_client.h"
14 #endif 14 #endif
15 15
16 namespace proximity_auth { 16 namespace proximity_auth {
17 namespace { 17 namespace {
18 18
19 base::LazyInstance<ScreenlockBridge> g_screenlock_bridge_instance = 19 base::LazyInstance<ScreenlockBridge>::DestructorAtExit
20 LAZY_INSTANCE_INITIALIZER; 20 g_screenlock_bridge_instance = LAZY_INSTANCE_INITIALIZER;
21 21
22 // Ids for the icons that are supported by lock screen and signin screen 22 // Ids for the icons that are supported by lock screen and signin screen
23 // account picker as user pod custom icons. 23 // account picker as user pod custom icons.
24 // The id's should be kept in sync with values used by user_pod_row.js. 24 // The id's should be kept in sync with values used by user_pod_row.js.
25 const char kLockedUserPodCustomIconId[] = "locked"; 25 const char kLockedUserPodCustomIconId[] = "locked";
26 const char kLockedToBeActivatedUserPodCustomIconId[] = "locked-to-be-activated"; 26 const char kLockedToBeActivatedUserPodCustomIconId[] = "locked-to-be-activated";
27 const char kLockedWithProximityHintUserPodCustomIconId[] = 27 const char kLockedWithProximityHintUserPodCustomIconId[] =
28 "locked-with-proximity-hint"; 28 "locked-with-proximity-hint";
29 const char kUnlockedUserPodCustomIconId[] = "unlocked"; 29 const char kUnlockedUserPodCustomIconId[] = "unlocked";
30 const char kHardlockedUserPodCustomIconId[] = "hardlocked"; 30 const char kHardlockedUserPodCustomIconId[] = "hardlocked";
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 observers_.RemoveObserver(observer); 179 observers_.RemoveObserver(observer);
180 } 180 }
181 181
182 ScreenlockBridge::ScreenlockBridge() 182 ScreenlockBridge::ScreenlockBridge()
183 : lock_handler_(nullptr), focused_account_id_(EmptyAccountId()) {} 183 : lock_handler_(nullptr), focused_account_id_(EmptyAccountId()) {}
184 184
185 ScreenlockBridge::~ScreenlockBridge() { 185 ScreenlockBridge::~ScreenlockBridge() {
186 } 186 }
187 187
188 } // namespace proximity_auth 188 } // namespace proximity_auth
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698