diff options
| author | Matthew Yuan <matthewyuan@google.com> | 2014-09-29 11:15:22 -0700 |
|---|---|---|
| committer | Matthew Yuan <matthewyuan@google.com> | 2014-09-29 18:16:12 +0000 |
| commit | ab934d0784bd54dbd4fae051681b488d1b0eebb0 (patch) | |
| tree | 7c5db1db25fefc4d5d89b69a4a2cf534f9184fae | |
| parent | ad2112a533194b36be4dcbaf25166d341862827a (diff) | |
| download | chromium_src-ab934d0784bd54dbd4fae051681b488d1b0eebb0.zip chromium_src-ab934d0784bd54dbd4fae051681b488d1b0eebb0.tar.gz chromium_src-ab934d0784bd54dbd4fae051681b488d1b0eebb0.tar.bz2 | |
Merging change into 38 branch.
Fix a browser crash on opening 'chrome://voicesearch' in guest mode.
Navigating directly to chrome://voicesearch in guest mode is causing
a crash, since the HotwordService is NULL in the guest mode. This
patch adds a NULL check on HotwordService to fix the crash.
BUG=411784
TEST=With --new-profile-management enabled, try to open chrome://voicesearch
in guest mode.
Review URL: https://codereview.chromium.org/554603002
Cr-Commit-Position: refs/heads/master@{#294149}
(cherry picked from commit ac54bf90d66dcc561e28106428f9b6a8cfa4eb64)
R=sudarsana.nagineni@intel.com
Review URL: https://codereview.chromium.org/618433002
Cr-Commit-Position: refs/branch-heads/2125@{#517}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
| -rw-r--r-- | chrome/browser/ui/webui/voicesearch_ui.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/voicesearch_ui.cc b/chrome/browser/ui/webui/voicesearch_ui.cc index cc69aae..03e79a3 100644 --- a/chrome/browser/ui/webui/voicesearch_ui.cc +++ b/chrome/browser/ui/webui/voicesearch_ui.cc @@ -245,7 +245,7 @@ class VoiceSearchDomHandler : public WebUIMessageHandler { std::string audio_logging_enabled = "No"; HotwordService* hotword_service = HotwordServiceFactory::GetForProfile(profile_); - if (hotword_service->IsOptedIntoAudioLogging()) + if (hotword_service && hotword_service->IsOptedIntoAudioLogging()) audio_logging_enabled = "Yes"; AddPair(list, ASCIIToUTF16("Hotword Audio Logging Enabled"), ASCIIToUTF16(audio_logging_enabled)); |