chrome/browser/ui/webui/voice_search_ui.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/ui/webui/voice_search_ui.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« no previous file with comments | « chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc ('k') | chrome/browser/ui/window_sizer/window_sizer.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 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/voice_search_ui.h"	5 #include "chrome/browser/ui/webui/voice_search_ui.h"

6	6

7 #include <string>	7 #include <string>

8 #include <utility>	8 #include <utility>

9	9

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/files/file_enumerator.h"	11 #include "base/files/file_enumerator.h"

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

13 #include "base/memory/weak_ptr.h"	13 #include "base/memory/weak_ptr.h"

14 #include "base/metrics/field_trial.h"	14 #include "base/metrics/field_trial.h"

15 #include "base/path_service.h"	15 #include "base/path_service.h"

16 #include "base/prefs/pref_service.h"

17 #include "base/strings/string_number_conversions.h"	16 #include "base/strings/string_number_conversions.h"

18 #include "base/strings/utf_string_conversions.h"	17 #include "base/strings/utf_string_conversions.h"

19 #include "build/build_config.h"	18 #include "build/build_config.h"

20 #include "chrome/browser/browser_process.h"	19 #include "chrome/browser/browser_process.h"

21 #include "chrome/browser/extensions/extension_service.h"	20 #include "chrome/browser/extensions/extension_service.h"

22 #include "chrome/browser/plugins/plugin_prefs.h"	21 #include "chrome/browser/plugins/plugin_prefs.h"

23 #include "chrome/browser/profiles/profile.h"	22 #include "chrome/browser/profiles/profile.h"

24 #include "chrome/browser/search/hotword_service.h"	23 #include "chrome/browser/search/hotword_service.h"

25 #include "chrome/browser/search/hotword_service_factory.h"	24 #include "chrome/browser/search/hotword_service_factory.h"

26 #include "chrome/browser/ui/app_list/start_page_service.h"	25 #include "chrome/browser/ui/app_list/start_page_service.h"

27 #include "chrome/browser/ui/webui/version_handler.h"	26 #include "chrome/browser/ui/webui/version_handler.h"

28 #include "chrome/common/channel_info.h"	27 #include "chrome/common/channel_info.h"

29 #include "chrome/common/chrome_content_client.h"	28 #include "chrome/common/chrome_content_client.h"

30 #include "chrome/common/chrome_paths.h"	29 #include "chrome/common/chrome_paths.h"

31 #include "chrome/common/extensions/extension_constants.h"	30 #include "chrome/common/extensions/extension_constants.h"

32 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

33 #include "chrome/common/url_constants.h"	32 #include "chrome/common/url_constants.h"

34 #include "chrome/grit/chromium_strings.h"	33 #include "chrome/grit/chromium_strings.h"

35 #include "chrome/grit/generated_resources.h"	34 #include "chrome/grit/generated_resources.h"

	35 #include "components/prefs/pref_service.h"

36 #include "components/version_info/version_info.h"	36 #include "components/version_info/version_info.h"

37 #include "content/public/browser/browser_thread.h"	37 #include "content/public/browser/browser_thread.h"

38 #include "content/public/browser/plugin_service.h"	38 #include "content/public/browser/plugin_service.h"

39 #include "content/public/browser/url_data_source.h"	39 #include "content/public/browser/url_data_source.h"

40 #include "content/public/browser/web_ui.h"	40 #include "content/public/browser/web_ui.h"

41 #include "content/public/browser/web_ui_data_source.h"	41 #include "content/public/browser/web_ui_data_source.h"

42 #include "content/public/browser/web_ui_message_handler.h"	42 #include "content/public/browser/web_ui_message_handler.h"

43 #include "content/public/common/user_agent.h"	43 #include "content/public/common/user_agent.h"

44 #include "extensions/browser/extension_prefs.h"	44 #include "extensions/browser/extension_prefs.h"

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

(...skipping 388 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
434 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)	434 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)

435 : content::WebUIController(web_ui) {	435 : content::WebUIController(web_ui) {

436 Profile* profile = Profile::FromWebUI(web_ui);	436 Profile* profile = Profile::FromWebUI(web_ui);

437 web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile));	437 web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile));

438	438

439 // Set up the about:voicesearch source.	439 // Set up the about:voicesearch source.

440 content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());	440 content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());

441 }	441 }

442	442

443 VoiceSearchUI::~VoiceSearchUI() {}	443 VoiceSearchUI::~VoiceSearchUI() {}

OLD	NEW