Fix the System Profile with extensions.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

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..9168bbd58a0a8e6345fe5cb252afd4f998b1336e 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -375,8 +375,10 @@ ChromeLauncherController::ChromeLauncherController(Profile* profile,
     // record profile, unless in guest session (where off the record profile is

[msw, 2015/05/21 04:34:43]

nit/q: Did you mean to use the system profile and not its original profile (if
that really exists)? Is the system profile an instance of ProfileImpl (or a
subclass instance, like OffTheRecordProfileImpl)? If the former, wouldn't
GetOriginalProfile return itself, and then isn't this change unnecessary?

[Mike Lerman, 2015/05/21 15:27:31]

SystemProfile is OTRProfileImpl. There is an original that was created, but we
don't want to use it. (this is similar to guest)
So yes, intentionally want to do what Guest does, and stay with the OTR version.

[msw, 2015/05/21 17:48:12]

Acknowledged.

     // the right one).
     Profile* active_profile = ProfileManager::GetActiveUserProfile();
-    profile_ = active_profile->IsGuestSession() ? active_profile :
-        active_profile->GetOriginalProfile();
+    profile_ =

[msw, 2015/05/21 04:34:43]

nit: consider:
  profile_ = ProfileManager::GetActiveUserProfile();
  if (!profile_->IsGuestSession() && !profile_->IsSystemProfile())
    profile_ = profile_->GetOriginalProfile();

[Mike Lerman, 2015/05/21 15:27:31]

Done.

+        active_profile->IsGuestSession() || active_profile->IsSystemProfile()
+            ? active_profile
+            : active_profile->GetOriginalProfile();
 
     app_sync_ui_state_ = AppSyncUIState::Get(profile_);
     if (app_sync_ui_state_)
@@ -2052,7 +2054,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();

[msw, 2015/05/21 04:34:43]

nit: should this only be indented 4 spaces without parens around the conditions?

[Mike Lerman, 2015/05/21 15:27:31]

I tried it your way, but apparently not - I did that, and then PRESUBMIT yelled
at me, and git cl format confirms this is the correct indentation.

[msw, 2015/05/21 17:48:12]

Acknowledged.

 }
 
 void ChromeLauncherController::CloseWindowedAppsFromRemovedExtension(