| Index: chrome/browser/ui/app_list/start_page_service.cc
|
| diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc
|
| index c64708642ee9c033d118f8f737ea755206a29420..42dc9f5081b8dfe04f8500faaf80f206389d7392 100644
|
| --- a/chrome/browser/ui/app_list/start_page_service.cc
|
| +++ b/chrome/browser/ui/app_list/start_page_service.cc
|
| @@ -36,7 +36,7 @@ class StartPageService::Factory : public BrowserContextKeyedServiceFactory {
|
| static StartPageService* GetForProfile(Profile* profile) {
|
| CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| if (!command_line->HasSwitch(::switches::kShowAppListStartPage) &&
|
| - !command_line->HasSwitch(app_list::switches::kEnableVoiceSearch)) {
|
| + command_line->HasSwitch(app_list::switches::kDisableVoiceSearch)) {
|
| return NULL;
|
| }
|
|
|
| @@ -165,9 +165,8 @@ content::WebContents* StartPageService::GetStartPageContents() {
|
| }
|
|
|
| content::WebContents* StartPageService::GetSpeechRecognitionContents() {
|
| - // Speech recognition is available if either of start-page or voice-search
|
| - // is enabled.
|
| - return contents_.get();
|
| + return CommandLine::ForCurrentProcess()->HasSwitch(
|
| + app_list::switches::kDisableVoiceSearch) ? NULL : contents_.get();
|
| }
|
|
|
| void StartPageService::OnSpeechResult(
|
|
|