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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/kiosk_app_menu_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility>
10
9 #include "base/bind.h" 11 #include "base/bind.h"
10 #include "base/command_line.h" 12 #include "base/command_line.h"
11 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
12 #include "base/sys_info.h" 14 #include "base/sys_info.h"
13 #include "base/values.h" 15 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 18 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
17 #include "chrome/browser/chromeos/login/existing_user_controller.h" 19 #include "chrome/browser/chromeos/login/existing_user_controller.h"
18 #include "chrome/browser/chromeos/login/screens/network_error.h" 20 #include "chrome/browser/chromeos/login/screens/network_error.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 if (app_data.icon.isNull()) { 112 if (app_data.icon.isNull()) {
111 icon_url = 113 icon_url =
112 webui::GetBitmapDataUrl(*ResourceBundle::GetSharedInstance() 114 webui::GetBitmapDataUrl(*ResourceBundle::GetSharedInstance()
113 .GetImageNamed(IDR_APP_DEFAULT_ICON) 115 .GetImageNamed(IDR_APP_DEFAULT_ICON)
114 .ToSkBitmap()); 116 .ToSkBitmap());
115 } else { 117 } else {
116 icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap()); 118 icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap());
117 } 119 }
118 app_info->SetString("iconUrl", icon_url); 120 app_info->SetString("iconUrl", icon_url);
119 121
120 apps_list.Append(app_info.release()); 122 apps_list.Append(std::move(app_info));
121 } 123 }
122 124
123 web_ui()->CallJavascriptFunctionUnsafe( 125 web_ui()->CallJavascriptFunctionUnsafe(
124 EnableNewKioskUI() ? kKioskSetAppsNewAPI : kKioskSetAppsOldAPI, 126 EnableNewKioskUI() ? kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,
125 apps_list); 127 apps_list);
126 } 128 }
127 129
128 void KioskAppMenuHandler::HandleInitializeKioskApps( 130 void KioskAppMenuHandler::HandleInitializeKioskApps(
129 const base::ListValue* args) { 131 const base::ListValue* args) {
130 is_webui_initialized_ = true; 132 is_webui_initialized_ = true;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 void KioskAppMenuHandler::OnKioskAppDataLoadFailure(const std::string& app_id) { 167 void KioskAppMenuHandler::OnKioskAppDataLoadFailure(const std::string& app_id) {
166 SendKioskApps(); 168 SendKioskApps();
167 } 169 }
168 170
169 void KioskAppMenuHandler::UpdateState(NetworkError::ErrorReason reason) { 171 void KioskAppMenuHandler::UpdateState(NetworkError::ErrorReason reason) {
170 if (network_state_informer_->state() == NetworkStateInformer::ONLINE) 172 if (network_state_informer_->state() == NetworkStateInformer::ONLINE)
171 KioskAppManager::Get()->RetryFailedAppDataFetch(); 173 KioskAppManager::Get()->RetryFailedAppDataFetch();
172 } 174 }
173 175
174 } // namespace chromeos 176 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/drive_internals_ui.cc ('k') | chrome/browser/ui/webui/chromeos/login/l10n_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698