Index: chrome/browser/search/hotword_service.cc |
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc |
index cecf9c5e33b7a219e022bb86e9bf74126c3f2ad3..293884de0d2f9507e33868ed2904ef9e63adf68c 100644 |
--- a/chrome/browser/search/hotword_service.cc |
+++ b/chrome/browser/search/hotword_service.cc |
@@ -819,5 +819,14 @@ void HotwordService::ActiveUserChanged() { |
} |
bool HotwordService::UserIsActive() { |
- return profile_ == ProfileManager::GetActiveUserProfile(); |
+#if defined(OS_CHROMEOS) |
+ // Only support multiple profiles and profile switching in ChromeOS. |
+ if (user_manager::UserManager::IsInitialized()) { |
+ user_manager::User* user = |
+ user_manager::UserManager::Get()->GetActiveUser(); |
+ if (user && user->is_profile_created()) |
+ return profile_ == ProfileManager::GetActiveUserProfile(); |
+ } |
+#endif |
+ return true; |
} |