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

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

Issue 2392693002: Rewrite simple uses of base::ListValue::Append(base::Value*) on CrOS. (Closed)
Patch Set: MakeUnique Created 4 years, 2 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/ui/webui/chromeos/login/user_image_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
6 6
7 #include <utility>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/metrics/histogram_macros.h" 11 #include "base/metrics/histogram_macros.h"
10 #include "base/values.h" 12 #include "base/values.h"
11 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 13 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
12 #include "chrome/browser/chromeos/login/existing_user_controller.h" 14 #include "chrome/browser/chromeos/login/existing_user_controller.h"
13 #include "chrome/browser/chromeos/login/screens/user_image_model.h" 15 #include "chrome/browser/chromeos/login/screens/user_image_model.h"
14 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 16 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
15 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im ages.h" 17 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im ages.h"
16 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h" 18 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 new base::DictionaryValue); 139 new base::DictionaryValue);
138 image_data->SetString("url", default_user_image::GetDefaultImageUrl(i)); 140 image_data->SetString("url", default_user_image::GetDefaultImageUrl(i));
139 image_data->SetString("author", 141 image_data->SetString("author",
140 l10n_util::GetStringUTF16( 142 l10n_util::GetStringUTF16(
141 default_user_image::kDefaultImageAuthorIDs[i])); 143 default_user_image::kDefaultImageAuthorIDs[i]));
142 image_data->SetString("website", 144 image_data->SetString("website",
143 l10n_util::GetStringUTF16( 145 l10n_util::GetStringUTF16(
144 default_user_image::kDefaultImageWebsiteIDs[i])); 146 default_user_image::kDefaultImageWebsiteIDs[i]));
145 image_data->SetString("title", 147 image_data->SetString("title",
146 default_user_image::GetDefaultImageDescription(i)); 148 default_user_image::GetDefaultImageDescription(i));
147 image_urls.Append(image_data.release()); 149 image_urls.Append(std::move(image_data));
148 } 150 }
149 CallJS("setDefaultImages", image_urls); 151 CallJS("setDefaultImages", image_urls);
150 } 152 }
151 153
152 void UserImageScreenHandler::HandleScreenReady() { 154 void UserImageScreenHandler::HandleScreenReady() {
153 is_ready_ = true; 155 is_ready_ = true;
154 if (model_) 156 if (model_)
155 model_->OnScreenReady(); 157 model_->OnScreenReady();
156 } 158 }
157 159
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 base::TimeDelta delta = base::Time::Now() - screen_show_time_; 195 base::TimeDelta delta = base::Time::Now() - screen_show_time_;
194 VLOG(1) << "Screen load time: " << delta.InSecondsF(); 196 VLOG(1) << "Screen load time: " << delta.InSecondsF();
195 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta); 197 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta);
196 } 198 }
197 199
198 void UserImageScreenHandler::HideCurtain() { 200 void UserImageScreenHandler::HideCurtain() {
199 CallJS("hideCurtain"); 201 CallJS("hideCurtain");
200 } 202 }
201 203
202 } // namespace chromeos 204 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698