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

Side by Side Diff: chrome/browser/ui/webui/options/reset_profile_settings_handler.cc

Issue 1494293004: Componentize strings from generated_resources needed by LocalizedError (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS Created 5 years 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/options/reset_profile_settings_handler.h" 5 #include "chrome/browser/ui/webui/options/reset_profile_settings_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/google/google_brand.h" 13 #include "chrome/browser/google/google_brand.h"
14 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h" 14 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
15 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" 15 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
16 #include "chrome/browser/profile_resetter/profile_resetter.h" 16 #include "chrome/browser/profile_resetter/profile_resetter.h"
17 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" 17 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
20 #include "chrome/grit/chromium_strings.h" 20 #include "chrome/grit/chromium_strings.h"
21 #include "chrome/grit/generated_resources.h" 21 #include "chrome/grit/generated_resources.h"
22 #include "components/strings/grit/components_strings.h"
22 #include "content/public/browser/user_metrics.h" 23 #include "content/public/browser/user_metrics.h"
23 #include "content/public/browser/web_ui.h" 24 #include "content/public/browser/web_ui.h"
24 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
25 26
26 #if defined(OS_WIN) 27 #if defined(OS_WIN)
27 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h" 28 #include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
28 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h" 29 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
29 #endif // defined(OS_WIN) 30 #endif // defined(OS_WIN)
30 31
31 namespace options { 32 namespace options {
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 Profile::FromWebUI(web_ui()), 219 Profile::FromWebUI(web_ui()),
219 *setting_snapshot_); 220 *setting_snapshot_);
220 base::DictionaryValue feedback_info; 221 base::DictionaryValue feedback_info;
221 feedback_info.Set("feedbackInfo", list.release()); 222 feedback_info.Set("feedbackInfo", list.release());
222 web_ui()->CallJavascriptFunction( 223 web_ui()->CallJavascriptFunction(
223 "ResetProfileSettingsOverlay.setFeedbackInfo", 224 "ResetProfileSettingsOverlay.setFeedbackInfo",
224 feedback_info); 225 feedback_info);
225 } 226 }
226 227
227 } // namespace options 228 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui_browsertest.cc ('k') | chrome/browser/ui/webui/uber/uber_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698