Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
index 0e6b955ca7a33a7ad24c4ca7b359b655f1ffe04c..c107eecf9e7af4f662aa02de27e712065ccdd97b 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
@@ -375,8 +375,8 @@ ChromeLauncherController::ChromeLauncherController(Profile* profile, |
// record profile, unless in guest session (where off the record profile is |
// the right one). |
Profile* active_profile = ProfileManager::GetActiveUserProfile(); |
- profile_ = active_profile->IsGuestSession() ? active_profile : |
- active_profile->GetOriginalProfile(); |
+ if (!active_profile->IsGuestSession() && !active_profile->IsSystemProfile()) |
msw
2015/05/21 17:48:12
Careful, this no longer sets |profile_|! Take anot
Mike Lerman
2015/05/21 19:24:33
Doh! Done.
|
+ active_profile = active_profile->GetOriginalProfile(); |
app_sync_ui_state_ = AppSyncUIState::Get(profile_); |
if (app_sync_ui_state_) |
@@ -2052,7 +2052,8 @@ bool ChromeLauncherController::IsIncognito( |
const content::WebContents* web_contents) const { |
const Profile* profile = |
Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
- return profile->IsOffTheRecord() && !profile->IsGuestSession(); |
+ return profile->IsOffTheRecord() && !profile->IsGuestSession() && |
+ !profile->IsSystemProfile(); |
} |
void ChromeLauncherController::CloseWindowedAppsFromRemovedExtension( |