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

Side by Side Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thakis comment, renamed LAZY_INSTANCE_INITIALIZER Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/login/screen_locker.h" 5 #include "chrome/browser/chromeos/login/screen_locker.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 } 168 }
169 169
170 content::NotificationRegistrar registrar_; 170 content::NotificationRegistrar registrar_;
171 std::string saved_previous_input_method_id_; 171 std::string saved_previous_input_method_id_;
172 std::string saved_current_input_method_id_; 172 std::string saved_current_input_method_id_;
173 std::vector<std::string> saved_active_input_method_list_; 173 std::vector<std::string> saved_active_input_method_list_;
174 174
175 DISALLOW_COPY_AND_ASSIGN(ScreenLockObserver); 175 DISALLOW_COPY_AND_ASSIGN(ScreenLockObserver);
176 }; 176 };
177 177
178 static base::LazyInstance<ScreenLockObserver> g_screen_lock_observer( 178 static base::LazyInstance<ScreenLockObserver> g_screen_lock_observer =
179 base::LINKER_INITIALIZED); 179 LAZY_INSTANCE_INITIALIZER;
180 180
181 } // namespace 181 } // namespace
182 182
183 namespace chromeos { 183 namespace chromeos {
184 184
185 // static 185 // static
186 ScreenLocker* ScreenLocker::screen_locker_ = NULL; 186 ScreenLocker* ScreenLocker::screen_locker_ = NULL;
187 187
188 ////////////////////////////////////////////////////////////////////////////// 188 //////////////////////////////////////////////////////////////////////////////
189 // ScreenLocker, public: 189 // ScreenLocker, public:
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 bool state = true; 446 bool state = true;
447 content::NotificationService::current()->Notify( 447 content::NotificationService::current()->Notify(
448 chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, 448 chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
449 content::Source<ScreenLocker>(this), 449 content::Source<ScreenLocker>(this),
450 content::Details<bool>(&state)); 450 content::Details<bool>(&state));
451 if (CrosLibrary::Get()->EnsureLoaded()) 451 if (CrosLibrary::Get()->EnsureLoaded())
452 CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted(); 452 CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
453 } 453 }
454 454
455 } // namespace chromeos 455 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698