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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/version_ui.cc ('k') | chrome/browser/ui/webui/welcome_ui_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/voicesearch_ui.h" 5 #include "chrome/browser/ui/webui/voicesearch_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/plugins/plugin_prefs.h" 15 #include "chrome/browser/plugins/plugin_prefs.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/search/hotword_service.h" 17 #include "chrome/browser/search/hotword_service.h"
18 #include "chrome/browser/search/hotword_service_factory.h" 18 #include "chrome/browser/search/hotword_service_factory.h"
19 #include "chrome/browser/ui/app_list/start_page_service.h" 19 #include "chrome/browser/ui/app_list/start_page_service.h"
20 #include "chrome/browser/ui/webui/version_handler.h" 20 #include "chrome/browser/ui/webui/version_handler.h"
21 #include "chrome/common/chrome_content_client.h" 21 #include "chrome/common/chrome_content_client.h"
22 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/chrome_version_info.h" 23 #include "chrome/common/chrome_version_info.h"
24 #include "chrome/common/extensions/extension_constants.h" 24 #include "chrome/common/extensions/extension_constants.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "chrome/grit/chromium_strings.h"
28 #include "chrome/grit/generated_resources.h"
29 #include "chrome/grit/google_chrome_strings.h"
27 #include "content/public/browser/plugin_service.h" 30 #include "content/public/browser/plugin_service.h"
28 #include "content/public/browser/url_data_source.h" 31 #include "content/public/browser/url_data_source.h"
29 #include "content/public/browser/web_ui.h" 32 #include "content/public/browser/web_ui.h"
30 #include "content/public/browser/web_ui_data_source.h" 33 #include "content/public/browser/web_ui_data_source.h"
31 #include "content/public/browser/web_ui_message_handler.h" 34 #include "content/public/browser/web_ui_message_handler.h"
32 #include "content/public/common/user_agent.h" 35 #include "content/public/common/user_agent.h"
33 #include "extensions/browser/extension_prefs.h" 36 #include "extensions/browser/extension_prefs.h"
34 #include "extensions/browser/extension_system.h" 37 #include "extensions/browser/extension_system.h"
35 #include "extensions/common/extension.h" 38 #include "extensions/common/extension.h"
36 #include "grit/browser_resources.h" 39 #include "grit/browser_resources.h"
37 #include "grit/chromium_strings.h"
38 #include "grit/generated_resources.h"
39 #include "grit/google_chrome_strings.h"
40 #include "ui/base/l10n/l10n_util.h" 40 #include "ui/base/l10n/l10n_util.h"
41 #include "v8/include/v8.h" 41 #include "v8/include/v8.h"
42 42
43 #if defined(OS_WIN) 43 #if defined(OS_WIN)
44 #include "base/win/windows_version.h" 44 #include "base/win/windows_version.h"
45 #endif 45 #endif
46 46
47 using base::ASCIIToUTF16; 47 using base::ASCIIToUTF16;
48 using content::WebUIMessageHandler; 48 using content::WebUIMessageHandler;
49 49
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui) 364 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)
365 : content::WebUIController(web_ui) { 365 : content::WebUIController(web_ui) {
366 Profile* profile = Profile::FromWebUI(web_ui); 366 Profile* profile = Profile::FromWebUI(web_ui);
367 web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile)); 367 web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile));
368 368
369 // Set up the about:voicesearch source. 369 // Set up the about:voicesearch source.
370 content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource()); 370 content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());
371 } 371 }
372 372
373 VoiceSearchUI::~VoiceSearchUI() {} 373 VoiceSearchUI::~VoiceSearchUI() {}
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/version_ui.cc ('k') | chrome/browser/ui/webui/welcome_ui_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698