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

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 d80e3d8754af1017546ad750cbb7d02435de3514..8e314c49f0a885e60d0cdbdf84fe225f31c01f75 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -332,8 +332,11 @@ ChromeLauncherController::ChromeLauncherController(Profile* 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.
-    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();

[Daniel Erat, 2013/12/19 20:25:54]

what does GetOriginalProfile() return if we're in guest mode? it seems broken if
we have both incognito and original profiles while we're in guest mode.

[tbarzic, 2013/12/19 20:50:30]

it returns the original profile; and it does seem a bit broken.
I don't know if we can create an incognito profile without an original, though.

[Daniel Erat, 2013/12/19 21:13:52]

until http://crbug.com/262299 is fixed, would it be better to make
GetOriginalProfile() automatically return the guest profile when
IsGuestSession() is true? would that prevent us from ever accidentally using the
"original" profile while in guest mode? (i have no idea if it'd be problematic
for other reasons.)

[rpetterson, 2013/12/19 21:28:15]

To my knowledge, you cannot create an incognito profile without an original
profile.

My primary concern would be security. That is if someone were able to access an
original profile they had no business using. I'm unsure how the guest profile is
different from the original profile and/or the incognito profile.

On 2013/12/19 21:13:52, Daniel Erat wrote:

 
     app_sync_ui_state_ = AppSyncUIState::Get(profile_);
     if (app_sync_ui_state_)