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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 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 "ash/audio/sounds.h" 7 #include "ash/audio/sounds.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 &UserImageScreenHandler::HandleImageAccepted); 126 &UserImageScreenHandler::HandleImageAccepted);
127 AddCallback("onUserImageScreenShown", 127 AddCallback("onUserImageScreenShown",
128 &UserImageScreenHandler::HandleScreenShown); 128 &UserImageScreenHandler::HandleScreenShown);
129 } 129 }
130 130
131 // TODO(antrim) : It looks more like parameters for "Init" rather than callback. 131 // TODO(antrim) : It looks more like parameters for "Init" rather than callback.
132 void UserImageScreenHandler::HandleGetImages() { 132 void UserImageScreenHandler::HandleGetImages() {
133 base::ListValue image_urls; 133 base::ListValue image_urls;
134 for (int i = default_user_image::kFirstDefaultImageIndex; 134 for (int i = default_user_image::kFirstDefaultImageIndex;
135 i < default_user_image::kDefaultImagesCount; ++i) { 135 i < default_user_image::kDefaultImagesCount; ++i) {
136 scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue); 136 std::unique_ptr<base::DictionaryValue> image_data(
137 new base::DictionaryValue);
137 image_data->SetString("url", default_user_image::GetDefaultImageUrl(i)); 138 image_data->SetString("url", default_user_image::GetDefaultImageUrl(i));
138 image_data->SetString("author", 139 image_data->SetString("author",
139 l10n_util::GetStringUTF16( 140 l10n_util::GetStringUTF16(
140 default_user_image::kDefaultImageAuthorIDs[i])); 141 default_user_image::kDefaultImageAuthorIDs[i]));
141 image_data->SetString("website", 142 image_data->SetString("website",
142 l10n_util::GetStringUTF16( 143 l10n_util::GetStringUTF16(
143 default_user_image::kDefaultImageWebsiteIDs[i])); 144 default_user_image::kDefaultImageWebsiteIDs[i]));
144 image_data->SetString("title", 145 image_data->SetString("title",
145 default_user_image::GetDefaultImageDescription(i)); 146 default_user_image::GetDefaultImageDescription(i));
146 image_urls.Append(image_data.release()); 147 image_urls.Append(image_data.release());
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 base::TimeDelta delta = base::Time::Now() - screen_show_time_; 191 base::TimeDelta delta = base::Time::Now() - screen_show_time_;
191 VLOG(1) << "Screen load time: " << delta.InSecondsF(); 192 VLOG(1) << "Screen load time: " << delta.InSecondsF();
192 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta); 193 UMA_HISTOGRAM_TIMES("UserImage.ScreenIsShownTime", delta);
193 } 194 }
194 195
195 void UserImageScreenHandler::HideCurtain() { 196 void UserImageScreenHandler::HideCurtain() {
196 CallJS("hideCurtain"); 197 CallJS("hideCurtain");
197 } 198 }
198 199
199 } // namespace chromeos 200 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698