chrome/browser/ui/webui/options/core_options_handler.cc - Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

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

Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: re^3base Created 6 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc ('k') | chrome/browser/ui/webui/options/font_settings_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

11 #include "base/strings/string16.h"	11 #include "base/strings/string16.h"

12 #include "base/strings/string_number_conversions.h"	12 #include "base/strings/string_number_conversions.h"

13 #include "base/strings/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "base/values.h"	14 #include "base/values.h"

15 #include "chrome/browser/browser_process.h"	15 #include "chrome/browser/browser_process.h"

16 #include "chrome/browser/chrome_notification_types.h"	16 #include "chrome/browser/chrome_notification_types.h"

17 #include "chrome/browser/extensions/extension_service.h"	17 #include "chrome/browser/extensions/extension_service.h"

18 #include "chrome/browser/extensions/extension_system.h"

19 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

20 #include "chrome/browser/ui/options/options_util.h"	19 #include "chrome/browser/ui/options/options_util.h"

21 #include "chrome/common/net/url_fixer_upper.h"	20 #include "chrome/common/net/url_fixer_upper.h"

22 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

23 #include "chrome/common/url_constants.h"	22 #include "chrome/common/url_constants.h"

24 #include "content/public/browser/notification_details.h"	23 #include "content/public/browser/notification_details.h"

25 #include "content/public/browser/notification_types.h"	24 #include "content/public/browser/notification_types.h"

26 #include "content/public/browser/user_metrics.h"	25 #include "content/public/browser/user_metrics.h"

27 #include "content/public/browser/web_ui.h"	26 #include "content/public/browser/web_ui.h"

28 #include "extensions/browser/extension_pref_value_map.h"	27 #include "extensions/browser/extension_pref_value_map.h"

29 #include "extensions/browser/extension_pref_value_map_factory.h"	28 #include "extensions/browser/extension_pref_value_map_factory.h"

	29 #include "extensions/browser/extension_system.h"

30 #include "extensions/common/extension.h"	30 #include "extensions/common/extension.h"

31 #include "grit/chromium_strings.h"	31 #include "grit/chromium_strings.h"

32 #include "grit/generated_resources.h"	32 #include "grit/generated_resources.h"

33 #include "grit/locale_settings.h"	33 #include "grit/locale_settings.h"

34 #include "grit/theme_resources.h"	34 #include "grit/theme_resources.h"

35 #include "ui/base/l10n/l10n_util.h"	35 #include "ui/base/l10n/l10n_util.h"

36 #include "url/gurl.h"	36 #include "url/gurl.h"

37	37

38 using base::UserMetricsAction;	38 using base::UserMetricsAction;

39	39

(...skipping 579 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
619 }	619 }

620	620

621 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {	621 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {

622 base::FundamentalValue enabled(	622 base::FundamentalValue enabled(

623 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());	623 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());

624 web_ui()->CallJavascriptFunction(	624 web_ui()->CallJavascriptFunction(

625 "OptionsPage.setPepperFlashSettingsEnabled", enabled);	625 "OptionsPage.setPepperFlashSettingsEnabled", enabled);

626 }	626 }

627	627

628 } // namespace options	628 } // namespace options

OLD	NEW