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

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

Issue 514493002: Cleanup: Remove unneeded grit include in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@grit_clean_chromium_strings_401588_a
Patch Set: rebase Created 6 years, 3 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/core_options_handler.h" 5 #include "chrome/browser/ui/webui/options/core_options_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/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 15 matching lines...) Expand all
26 #include "components/url_fixer/url_fixer.h" 26 #include "components/url_fixer/url_fixer.h"
27 #include "content/public/browser/notification_details.h" 27 #include "content/public/browser/notification_details.h"
28 #include "content/public/browser/notification_types.h" 28 #include "content/public/browser/notification_types.h"
29 #include "content/public/browser/user_metrics.h" 29 #include "content/public/browser/user_metrics.h"
30 #include "content/public/browser/web_ui.h" 30 #include "content/public/browser/web_ui.h"
31 #include "extensions/browser/extension_pref_value_map.h" 31 #include "extensions/browser/extension_pref_value_map.h"
32 #include "extensions/browser/extension_pref_value_map_factory.h" 32 #include "extensions/browser/extension_pref_value_map_factory.h"
33 #include "extensions/browser/extension_registry.h" 33 #include "extensions/browser/extension_registry.h"
34 #include "extensions/browser/extension_system.h" 34 #include "extensions/browser/extension_system.h"
35 #include "extensions/common/extension.h" 35 #include "extensions/common/extension.h"
36 #include "grit/theme_resources.h"
37 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
38 #include "url/gurl.h" 37 #include "url/gurl.h"
39 38
40 using base::UserMetricsAction; 39 using base::UserMetricsAction;
41 40
42 namespace options { 41 namespace options {
43 42
44 namespace { 43 namespace {
45 44
46 // Only allow changes to the metrics reporting checkbox if we were succesfully 45 // Only allow changes to the metrics reporting checkbox if we were succesfully
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 } 650 }
652 651
653 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() { 652 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {
654 base::FundamentalValue enabled( 653 base::FundamentalValue enabled(
655 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()); 654 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());
656 web_ui()->CallJavascriptFunction( 655 web_ui()->CallJavascriptFunction(
657 "OptionsPage.setPepperFlashSettingsEnabled", enabled); 656 "OptionsPage.setPepperFlashSettingsEnabled", enabled);
658 } 657 }
659 658
660 } // namespace options 659 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698