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

Side by Side Diff: chrome/browser/automation/automation_provider_observers_chromeos.cc

Issue 10448105: Revert "Added support for animated/nonanimated user image. There are no" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/mock_user_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/automation/automation_provider_observers.h" 5 #include "chrome/browser/automation/automation_provider_observers.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/automation/automation_provider.h" 8 #include "chrome/browser/automation/automation_provider.h"
9 #include "chrome/browser/chromeos/cros/cros_library.h" 9 #include "chrome/browser/chromeos/cros/cros_library.h"
10 #include "chrome/browser/chromeos/login/authentication_notification_details.h" 10 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
11 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_ actor.h" 11 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_ actor.h"
12 #include "chrome/browser/chromeos/login/existing_user_controller.h" 12 #include "chrome/browser/chromeos/login/existing_user_controller.h"
13 #include "chrome/browser/chromeos/login/screen_locker.h" 13 #include "chrome/browser/chromeos/login/screen_locker.h"
14 #include "chrome/browser/chromeos/login/user_image.h"
15 #include "chrome/browser/chromeos/login/user_manager.h" 14 #include "chrome/browser/chromeos/login/user_manager.h"
16 #include "chrome/browser/chromeos/login/wizard_controller.h" 15 #include "chrome/browser/chromeos/login/wizard_controller.h"
17 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
18 #include "content/public/browser/notification_service.h" 17 #include "content/public/browser/notification_service.h"
19 18
20 using chromeos::CrosLibrary; 19 using chromeos::CrosLibrary;
21 using chromeos::NetworkLibrary; 20 using chromeos::NetworkLibrary;
22 21
23 NetworkManagerInitObserver::NetworkManagerInitObserver( 22 NetworkManagerInitObserver::NetworkManagerInitObserver(
24 AutomationProvider* automation) 23 AutomationProvider* automation)
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 AutomationJSONReply( 443 AutomationJSONReply(
445 automation_, 444 automation_,
446 reply_message_.release()).SendError("User email is not set"); 445 reply_message_.release()).SendError("User email is not set");
447 } 446 }
448 delete this; 447 delete this;
449 return; 448 return;
450 } 449 }
451 450
452 // Set up an observer for UserManager (it will delete itself). 451 // Set up an observer for UserManager (it will delete itself).
453 user_manager->AddObserver(this); 452 user_manager->AddObserver(this);
454 user_manager->SaveUserImage(user.email(), chromeos::UserImage(photo)); 453 user_manager->SaveUserImage(user.email(), photo);
455 } 454 }
456 455
457 void PhotoCaptureObserver::LocalStateChanged( 456 void PhotoCaptureObserver::LocalStateChanged(
458 chromeos::UserManager* user_manager) { 457 chromeos::UserManager* user_manager) {
459 user_manager->RemoveObserver(this); 458 user_manager->RemoveObserver(this);
460 if (automation_) { 459 if (automation_) {
461 AutomationJSONReply( 460 AutomationJSONReply(
462 automation_, reply_message_.release()).SendSuccess(NULL); 461 automation_, reply_message_.release()).SendSuccess(NULL);
463 } 462 }
464 delete this; 463 delete this;
465 } 464 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/mock_user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698