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

Unified Diff: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

Issue 14063018: Implemented argument wrapping for CallJS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get rid of macro. Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index 6ce65e6e5a4fc528b02fb3f1880dbc1613dc3689..bf2e7f8965abf0a61c6d88df234b003fc65c29ea 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -99,11 +99,8 @@ void UserImageScreenHandler::PrepareToShow() {
void UserImageScreenHandler::SelectImage(int index) {
selected_image_ = index;
- if (page_is_ready()) {
- base::StringValue image_url(GetDefaultImageUrl(index));
- CallJS("oobe.UserImageScreen.setSelectedImage",
- image_url);
- }
+ if (page_is_ready())
+ CallJS("oobe.UserImageScreen.setSelectedImage", GetDefaultImageUrl(index));
}
void UserImageScreenHandler::CheckCameraPresence() {
@@ -130,10 +127,8 @@ void UserImageScreenHandler::AddProfileImage(const gfx::ImageSkia& image) {
}
void UserImageScreenHandler::SendProfileImage(const std::string& data_url) {
- if (page_is_ready()) {
- base::StringValue data_url_value(data_url);
- CallJS("oobe.UserImageScreen.setProfileImage", data_url_value);
- }
+ if (page_is_ready())
+ CallJS("oobe.UserImageScreen.setProfileImage", data_url);
}
void UserImageScreenHandler::OnProfileImageAbsent() {
@@ -239,9 +234,9 @@ void UserImageScreenHandler::HandleScreenShown() {
}
void UserImageScreenHandler::OnCameraPresenceCheckDone() {
- base::FundamentalValue present_value(
- CameraDetector::camera_presence() == CameraDetector::kCameraPresent);
- CallJS("oobe.UserImageScreen.setCameraPresent", present_value);
+ bool present =
+ (CameraDetector::camera_presence() == CameraDetector::kCameraPresent);
+ CallJS("oobe.UserImageScreen.setCameraPresent", present);
bartfab (slow) 2013/04/18 07:39:31 Nit: You can inline the comparison here: CallJS("
Denis Kuznetsov (DE-MUC) 2013/04/18 07:46:52 That would actually be gone when https://coderevie
ygorshenin1 2013/04/18 07:58:23 Done.
}
void UserImageScreenHandler::OnImageDecoded(const ImageDecoder* decoder,
@@ -257,8 +252,7 @@ void UserImageScreenHandler::OnDecodeImageFailed(const ImageDecoder* decoder) {
}
void UserImageScreenHandler::SetProfilePictureEnabled(bool enabled) {
- base::FundamentalValue present_value(enabled);
- CallJS("oobe.UserImageScreen.setProfilePictureEnabled", present_value);
+ CallJS("oobe.UserImageScreen.setProfilePictureEnabled", enabled);
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698