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

Side by Side Diff: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

Issue 1991083002: Remove ExtensionFunction::SetResult(T*) overload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU Created 4 years, 7 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/extensions/api/feedback_private/feedback_private_api.h" 5 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 EventRouter::Get(browser_context_) 129 EventRouter::Get(browser_context_)
130 ->DispatchEventToExtension(extension_misc::kFeedbackExtensionId, 130 ->DispatchEventToExtension(extension_misc::kFeedbackExtensionId,
131 std::move(event)); 131 std::move(event));
132 } 132 }
133 } 133 }
134 134
135 // static 135 // static
136 base::Closure* FeedbackPrivateGetStringsFunction::test_callback_ = NULL; 136 base::Closure* FeedbackPrivateGetStringsFunction::test_callback_ = NULL;
137 137
138 bool FeedbackPrivateGetStringsFunction::RunSync() { 138 bool FeedbackPrivateGetStringsFunction::RunSync() {
139 base::DictionaryValue* dict = new base::DictionaryValue(); 139 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
140 SetResult(dict);
141 140
142 #define SET_STRING(id, idr) \ 141 #define SET_STRING(id, idr) \
143 dict->SetString(id, l10n_util::GetStringUTF16(idr)) 142 dict->SetString(id, l10n_util::GetStringUTF16(idr))
144 SET_STRING("page-title", IDS_FEEDBACK_REPORT_PAGE_TITLE); 143 SET_STRING("page-title", IDS_FEEDBACK_REPORT_PAGE_TITLE);
145 SET_STRING("page-url", IDS_FEEDBACK_REPORT_URL_LABEL); 144 SET_STRING("page-url", IDS_FEEDBACK_REPORT_URL_LABEL);
146 SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL); 145 SET_STRING("screenshot", IDS_FEEDBACK_SCREENSHOT_LABEL);
147 SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL); 146 SET_STRING("user-email", IDS_FEEDBACK_USER_EMAIL_LABEL);
148 #if defined(OS_CHROMEOS) 147 #if defined(OS_CHROMEOS)
149 SET_STRING("sys-info", 148 SET_STRING("sys-info",
150 IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX); 149 IDS_FEEDBACK_INCLUDE_SYSTEM_INFORMATION_AND_METRICS_CHKBOX);
(...skipping 20 matching lines...) Expand all
171 SET_STRING("sysinfoPageCollapseBtn", IDS_ABOUT_SYS_COLLAPSE); 170 SET_STRING("sysinfoPageCollapseBtn", IDS_ABOUT_SYS_COLLAPSE);
172 SET_STRING("sysinfoPageStatusLoading", IDS_FEEDBACK_SYSINFO_PAGE_LOADING); 171 SET_STRING("sysinfoPageStatusLoading", IDS_FEEDBACK_SYSINFO_PAGE_LOADING);
173 // And the localized strings needed for the SRT Download Prompt. 172 // And the localized strings needed for the SRT Download Prompt.
174 SET_STRING("srtPromptBody", IDS_FEEDBACK_SRT_PROMPT_BODY); 173 SET_STRING("srtPromptBody", IDS_FEEDBACK_SRT_PROMPT_BODY);
175 SET_STRING("srtPromptAcceptButton", IDS_FEEDBACK_SRT_PROMPT_ACCEPT_BUTTON); 174 SET_STRING("srtPromptAcceptButton", IDS_FEEDBACK_SRT_PROMPT_ACCEPT_BUTTON);
176 SET_STRING("srtPromptDeclineButton", 175 SET_STRING("srtPromptDeclineButton",
177 IDS_FEEDBACK_SRT_PROMPT_DECLINE_BUTTON); 176 IDS_FEEDBACK_SRT_PROMPT_DECLINE_BUTTON);
178 #undef SET_STRING 177 #undef SET_STRING
179 178
180 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 179 const std::string& app_locale = g_browser_process->GetApplicationLocale();
181 webui::SetLoadTimeDataDefaults(app_locale, dict); 180 webui::SetLoadTimeDataDefaults(app_locale, dict.get());
181
182 SetResult(std::move(dict));
182 183
183 if (test_callback_ && !test_callback_->is_null()) 184 if (test_callback_ && !test_callback_->is_null())
184 test_callback_->Run(); 185 test_callback_->Run();
185 186
186 return true; 187 return true;
187 } 188 }
188 189
189 bool FeedbackPrivateGetUserEmailFunction::RunSync() { 190 bool FeedbackPrivateGetUserEmailFunction::RunSync() {
190 SigninManagerBase* signin_manager = 191 SigninManagerBase* signin_manager =
191 SigninManagerFactory::GetForProfile(GetProfile()); 192 SigninManagerFactory::GetForProfile(GetProfile());
192 SetResult(new base::StringValue( 193 SetResult(base::MakeUnique<base::StringValue>(
193 signin_manager ? signin_manager->GetAuthenticatedAccountInfo().email 194 signin_manager ? signin_manager->GetAuthenticatedAccountInfo().email
194 : std::string())); 195 : std::string()));
195 return true; 196 return true;
196 } 197 }
197 198
198 bool FeedbackPrivateGetSystemInformationFunction::RunAsync() { 199 bool FeedbackPrivateGetSystemInformationFunction::RunAsync() {
199 FeedbackService* service = 200 FeedbackService* service =
200 FeedbackPrivateAPI::GetFactoryInstance()->Get(GetProfile())->GetService(); 201 FeedbackPrivateAPI::GetFactoryInstance()->Get(GetProfile())->GetService();
201 DCHECK(service); 202 DCHECK(service);
202 service->GetSystemInformation( 203 service->GetSystemInformation(
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 content::RecordAction( 312 content::RecordAction(
312 base::UserMetricsAction("Feedback.SrtPromptClosed")); 313 base::UserMetricsAction("Feedback.SrtPromptClosed"));
313 break; 314 break;
314 default: 315 default:
315 return RespondNow(Error("Invalid arugment.")); 316 return RespondNow(Error("Invalid arugment."));
316 } 317 }
317 return RespondNow(NoArguments()); 318 return RespondNow(NoArguments());
318 } 319 }
319 320
320 } // namespace extensions 321 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698