| OLD | NEW |
| 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" |
| (...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 AutomationJSONReply(automation_, | 482 AutomationJSONReply(automation_, |
| 483 reply_message_.release()).SendError("Capture failure"); | 483 reply_message_.release()).SendError("Capture failure"); |
| 484 } | 484 } |
| 485 delete this; | 485 delete this; |
| 486 } | 486 } |
| 487 | 487 |
| 488 void PhotoCaptureObserver::OnCapturingStopped( | 488 void PhotoCaptureObserver::OnCapturingStopped( |
| 489 chromeos::TakePhotoDialog* take_photo_dialog, | 489 chromeos::TakePhotoDialog* take_photo_dialog, |
| 490 chromeos::TakePhotoView* take_photo_view) { | 490 chromeos::TakePhotoView* take_photo_view) { |
| 491 take_photo_dialog->Accept(); | 491 take_photo_dialog->Accept(); |
| 492 const SkBitmap& photo = take_photo_view->GetImage(); | 492 const gfx::ImageSkia& photo = take_photo_view->GetImage(); |
| 493 chromeos::UserManager* user_manager = chromeos::UserManager::Get(); | 493 chromeos::UserManager* user_manager = chromeos::UserManager::Get(); |
| 494 if (!user_manager) { | 494 if (!user_manager) { |
| 495 if (automation_) { | 495 if (automation_) { |
| 496 AutomationJSONReply( | 496 AutomationJSONReply( |
| 497 automation_, | 497 automation_, |
| 498 reply_message_.release()).SendError("No user manager"); | 498 reply_message_.release()).SendError("No user manager"); |
| 499 } | 499 } |
| 500 delete this; | 500 delete this; |
| 501 return; | 501 return; |
| 502 } | 502 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 519 | 519 |
| 520 void PhotoCaptureObserver::LocalStateChanged( | 520 void PhotoCaptureObserver::LocalStateChanged( |
| 521 chromeos::UserManager* user_manager) { | 521 chromeos::UserManager* user_manager) { |
| 522 user_manager->RemoveObserver(this); | 522 user_manager->RemoveObserver(this); |
| 523 if (automation_) { | 523 if (automation_) { |
| 524 AutomationJSONReply( | 524 AutomationJSONReply( |
| 525 automation_, reply_message_.release()).SendSuccess(NULL); | 525 automation_, reply_message_.release()).SendSuccess(NULL); |
| 526 } | 526 } |
| 527 delete this; | 527 delete this; |
| 528 } | 528 } |
| OLD | NEW |