Do not use the 'original' profile for guest sessions

chrome/browser/ui/settings_window_manager.cc

 // Copyright (c) 2014 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/settings_window_manager.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 17 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void SettingsWindowManager::RemoveObserver(
     SettingsWindowManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void SettingsWindowManager::ShowChromePageForProfile(Profile* profile,
                                                      const GURL& gurl) {
-  // Use the original (non off-the-record) profile for settings.
-  profile = profile->GetOriginalProfile();
+  // Use the original (non off-the-record) profile for settings unless
+  // this is a guest session.
+  if (!profile->IsGuestSession() && profile->IsOffTheRecord())
+    profile = profile->GetOriginalProfile();
+
   // Look for an existing browser window.
   Browser* browser = FindBrowserForProfile(profile);
   if (browser) {
     DCHECK(browser->profile() == profile);
     const content::WebContents* web_contents =
         browser->tab_strip_model()->GetWebContentsAt(0);
     if (web_contents && web_contents->GetURL() == gurl) {
       browser->window()->Show();
       return;
     }
@@ skipping 34 matching lines @@
           iter->second == browser->session_id().id());
 }
 
 SettingsWindowManager::SettingsWindowManager() {
 }
 
 SettingsWindowManager::~SettingsWindowManager() {
 }
 
 }  // namespace chrome