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

Unified Diff: trunk/src/chrome/browser/ui/app_list/start_page_service.cc

Issue 139293012: Revert 245093 "Flag-flip of app-list-voice-search. Now it's on b..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/about_flags.cc ('k') | trunk/src/ui/app_list/app_list_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/app_list/start_page_service.cc
===================================================================
--- trunk/src/chrome/browser/ui/app_list/start_page_service.cc (revision 245183)
+++ trunk/src/chrome/browser/ui/app_list/start_page_service.cc (working copy)
@@ -36,7 +36,7 @@
static StartPageService* GetForProfile(Profile* profile) {
CommandLine* command_line = CommandLine::ForCurrentProcess();
if (!command_line->HasSwitch(::switches::kShowAppListStartPage) &&
- command_line->HasSwitch(app_list::switches::kDisableVoiceSearch)) {
+ !command_line->HasSwitch(app_list::switches::kEnableVoiceSearch)) {
return NULL;
}
@@ -165,8 +165,9 @@
}
content::WebContents* StartPageService::GetSpeechRecognitionContents() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- app_list::switches::kDisableVoiceSearch) ? NULL : contents_.get();
+ // Speech recognition is available if either of start-page or voice-search
+ // is enabled.
+ return contents_.get();
}
void StartPageService::OnSpeechResult(
« no previous file with comments | « trunk/src/chrome/browser/about_flags.cc ('k') | trunk/src/ui/app_list/app_list_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698