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

Side by Side Diff: chrome/browser/chromeos/extensions/screenlock_private_api.cc

Issue 178193030: Rename ProfileKeyedAPI to BrowserContextKeyedAPI and GetProfile to Get. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/extensions/screenlock_private_api.h" 5 #include "chrome/browser/chromeos/extensions/screenlock_private_api.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/login/screen_locker.h" 9 #include "chrome/browser/chromeos/login/screen_locker.h"
10 #include "chrome/browser/extensions/image_loader.h" 10 #include "chrome/browser/extensions/image_loader.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 gfx::Size(kMaxButtonIconSize, kMaxButtonIconSize), 135 gfx::Size(kMaxButtonIconSize, kMaxButtonIconSize),
136 base::Bind(&ScreenlockPrivateShowButtonFunction::OnImageLoaded, this)); 136 base::Bind(&ScreenlockPrivateShowButtonFunction::OnImageLoaded, this));
137 return true; 137 return true;
138 } 138 }
139 139
140 void ScreenlockPrivateShowButtonFunction::OnImageLoaded( 140 void ScreenlockPrivateShowButtonFunction::OnImageLoaded(
141 const gfx::Image& image) { 141 const gfx::Image& image) {
142 chromeos::ScreenLocker* locker = 142 chromeos::ScreenLocker* locker =
143 chromeos::ScreenLocker::default_screen_locker(); 143 chromeos::ScreenLocker::default_screen_locker();
144 ScreenlockPrivateEventRouter* router = 144 ScreenlockPrivateEventRouter* router =
145 ScreenlockPrivateEventRouter::GetFactoryInstance()->GetForProfile( 145 ScreenlockPrivateEventRouter::GetFactoryInstance()->Get(GetProfile());
146 GetProfile());
147 const chromeos::User* user = 146 const chromeos::User* user =
148 chromeos::UserManager::Get()->GetUserByProfile(GetProfile()); 147 chromeos::UserManager::Get()->GetUserByProfile(GetProfile());
149 locker->ShowUserPodButton( 148 locker->ShowUserPodButton(
150 user->email(), 149 user->email(),
151 image, 150 image,
152 base::Bind(&ScreenlockPrivateEventRouter::OnButtonClicked, 151 base::Bind(&ScreenlockPrivateEventRouter::OnButtonClicked,
153 base::Unretained(router))); 152 base::Unretained(router)));
154 SendResponse(error_.empty()); 153 SendResponse(error_.empty());
155 } 154 }
156 155
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 scoped_ptr<base::ListValue> args(new base::ListValue()); 271 scoped_ptr<base::ListValue> args(new base::ListValue());
273 if (arg) 272 if (arg)
274 args->Append(arg); 273 args->Append(arg);
275 scoped_ptr<extensions::Event> event(new extensions::Event( 274 scoped_ptr<extensions::Event> event(new extensions::Event(
276 event_name, args.Pass())); 275 event_name, args.Pass()));
277 extensions::ExtensionSystem::Get(browser_context_) 276 extensions::ExtensionSystem::Get(browser_context_)
278 ->event_router() 277 ->event_router()
279 ->BroadcastEvent(event.Pass()); 278 ->BroadcastEvent(event.Pass());
280 } 279 }
281 280
282 static base::LazyInstance<extensions::ProfileKeyedAPIFactory< 281 static base::LazyInstance<extensions::BrowserContextKeyedAPIFactory<
283 ScreenlockPrivateEventRouter> > 282 ScreenlockPrivateEventRouter> > g_factory = LAZY_INSTANCE_INITIALIZER;
284 g_factory = LAZY_INSTANCE_INITIALIZER;
285 283
286 // static 284 // static
287 extensions::ProfileKeyedAPIFactory<ScreenlockPrivateEventRouter>* 285 extensions::BrowserContextKeyedAPIFactory<ScreenlockPrivateEventRouter>*
288 ScreenlockPrivateEventRouter::GetFactoryInstance() { 286 ScreenlockPrivateEventRouter::GetFactoryInstance() {
289 return g_factory.Pointer(); 287 return g_factory.Pointer();
290 } 288 }
291 289
292 void ScreenlockPrivateEventRouter::Shutdown() { 290 void ScreenlockPrivateEventRouter::Shutdown() {
293 chromeos::SessionManagerClient* session_manager = 291 chromeos::SessionManagerClient* session_manager =
294 chromeos::DBusThreadManager::Get()->GetSessionManagerClient(); 292 chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
295 if (session_manager->HasObserver(this)) 293 if (session_manager->HasObserver(this))
296 session_manager->RemoveObserver(this); 294 session_manager->RemoveObserver(this);
297 } 295 }
(...skipping 11 matching lines...) Expand all
309 args->AppendString(value); 307 args->AppendString(value);
310 308
311 scoped_ptr<extensions::Event> event(new extensions::Event( 309 scoped_ptr<extensions::Event> event(new extensions::Event(
312 screenlock::OnAuthAttempted::kEventName, args.Pass())); 310 screenlock::OnAuthAttempted::kEventName, args.Pass()));
313 extensions::ExtensionSystem::Get(browser_context_) 311 extensions::ExtensionSystem::Get(browser_context_)
314 ->event_router() 312 ->event_router()
315 ->BroadcastEvent(event.Pass()); 313 ->BroadcastEvent(event.Pass());
316 } 314 }
317 315
318 } // namespace extensions 316 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/screenlock_private_api.h ('k') | chrome/browser/chromeos/login/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698