| 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(
|
|
|