chrome/browser/ui/webui/options2/core_options_handler2.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Side by Side Diff: chrome/browser/ui/webui/options2/core_options_handler2.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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/options2/cookies_view_handler2.cc ('k') | chrome/browser/ui/webui/options2/font_settings_handler2.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
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/options2/core_options_handler2.h"	5 #include "chrome/browser/ui/webui/options2/core_options_handler2.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/string16.h"	11 #include "base/string16.h"

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

13 #include "base/utf_string_conversions.h"	13 #include "base/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/google/google_util.h"	16 #include "chrome/browser/google/google_util.h"

17 #include "chrome/browser/net/url_fixer_upper.h"	17 #include "chrome/browser/net/url_fixer_upper.h"

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

19 #include "chrome/common/chrome_notification_types.h"	19 #include "chrome/common/chrome_notification_types.h"

20 #include "chrome/common/pref_names.h"	20 #include "chrome/common/pref_names.h"

21 #include "chrome/common/url_constants.h"	21 #include "chrome/common/url_constants.h"

	22 #include "content/browser/webui/web_ui.h"

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

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

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

25 #include "googleurl/src/gurl.h"	26 #include "googleurl/src/gurl.h"

26 #include "grit/chromium_strings.h"	27 #include "grit/chromium_strings.h"

27 #include "grit/generated_resources.h"	28 #include "grit/generated_resources.h"

28 #include "grit/locale_settings.h"	29 #include "grit/locale_settings.h"

29 #include "grit/theme_resources.h"	30 #include "grit/theme_resources.h"

30 #include "ui/base/l10n/l10n_util.h"	31 #include "ui/base/l10n/l10n_util.h"

31	32

(...skipping 423 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
455	456

456 void CoreOptionsHandler::UpdateClearPluginLSOData() {	457 void CoreOptionsHandler::UpdateClearPluginLSOData() {

457 scoped_ptr<base::Value> enabled(	458 scoped_ptr<base::Value> enabled(

458 base::Value::CreateBooleanValue(	459 base::Value::CreateBooleanValue(

459 clear_plugin_lso_data_enabled_.GetValue()));	460 clear_plugin_lso_data_enabled_.GetValue()));

460 web_ui()->CallJavascriptFunction(	461 web_ui()->CallJavascriptFunction(

461 "OptionsPage.setClearPluginLSODataEnabled", *enabled);	462 "OptionsPage.setClearPluginLSODataEnabled", *enabled);

462 }	463 }

463	464

464 } // namespace options2	465 } // namespace options2

OLD	NEW