Fix non-otr profile's file manager being launched in guest mode.

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 310 matching lines @@
 }
 #endif
 
 ChromeLauncherController::ChromeLauncherController(Profile* profile,
                                                    ash::ShelfModel* model)
     : model_(model),
       item_delegate_manager_(NULL),
       profile_(profile),
       app_sync_ui_state_(NULL),
       ignore_persist_pinned_state_change_(false) {
   if (!profile_) {

[stevenjb, 2013/12/26 22:34:17]

Do we need to check for the right profile for Guest mode here like we do for
AppList?

[tbarzic, 2013/12/27 22:35:38]

I don't think we do. If the profile is passed to the Controller, we should
probably assume that |profile_| is the profile that should be used at this point
(and profile_ seems to be set only in tests).

     // 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.
-    profile_ = ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
+    // 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();
 
     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 1668 matching lines @@
 }
 
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }