chrome/browser/ui/webui/options/core_options_handler.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

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/string16.h"	11 #include "base/string16.h"

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

13 #include "base/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/net/url_fixer_upper.h"	16 #include "chrome/browser/net/url_fixer_upper.h"

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

18 #include "chrome/browser/ui/options/options_util.h"	18 #include "chrome/browser/ui/options/options_util.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/public/browser/notification_details.h"	22 #include "content/public/browser/notification_details.h"

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

(...skipping 523 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
547 }	547 }

548	548

549 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {	549 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {

550 base::FundamentalValue enabled(	550 base::FundamentalValue enabled(

551 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());	551 plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());

552 web_ui()->CallJavascriptFunction(	552 web_ui()->CallJavascriptFunction(

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

554 }	554 }

555	555

556 } // namespace options	556 } // namespace options

OLD	NEW