Fix the System Profile with extensions.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 354 matching lines @@
                                                    ash::ShelfModel* model)
     : model_(model),
       item_delegate_manager_(NULL),
       profile_(profile),
       app_sync_ui_state_(NULL),
       ignore_persist_pinned_state_change_(false) {
   if (!profile_) {
     // If no profile was passed, we take the currently active profile and use it
     // as the owner of the current desktop.
     // Use the original profile as on chromeos we may get a temporary off the
     // 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_)
       app_sync_ui_state_->AddObserver(this);
   }
 
   // All profile relevant settings get bound to the current profile.
   AttachProfile(profile_);
   model_->AddObserver(this);
 
@@ skipping 1655 matching lines @@
   if (!app_list_icon_added) {
     pinned_apps.insert(pinned_apps.begin(), kAppShelfIdPlaceholder);
   }
   return pinned_apps;
 }
 
 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(
     const std::string& app_id,
     const Profile* profile) {
   // This function cannot rely on the controller's enumeration functionality
   // since the extension has already be unloaded.
   const BrowserList* ash_browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
   std::vector<Browser*> browser_to_close;
@@ skipping 73 matching lines @@
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }