diff options
| author | Steven Bennetts <stevenjb@chromium.org> | 2014-11-11 16:49:30 -0800 |
|---|---|---|
| committer | Steven Bennetts <stevenjb@chromium.org> | 2014-11-12 00:50:48 +0000 |
| commit | 8189f30d7b7fa082cb09cf7e6f17400ca7f85697 (patch) | |
| tree | 86a12b96f11187d7321a0a0e062c231c03b17d66 | |
| parent | 0292d6ffdc1ea5afa4ea4a1956c0baeb636aa3f0 (diff) | |
| download | chromium_src-8189f30d7b7fa082cb09cf7e6f17400ca7f85697.zip chromium_src-8189f30d7b7fa082cb09cf7e6f17400ca7f85697.tar.gz chromium_src-8189f30d7b7fa082cb09cf7e6f17400ca7f85697.tar.bz2 | |
Use original profile for Settings popups
BUG=430726
TBR=skuhne@chromium.org
Review URL: https://codereview.chromium.org/711593003
Cr-Commit-Position: refs/heads/master@{#303695}
(cherry picked from commit f35165a2d68e20b80779f5bf0d20c6e0fa4a4c34)
Review URL: https://codereview.chromium.org/717843003
Cr-Commit-Position: refs/branch-heads/2171@{#413}
Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
| -rw-r--r-- | chrome/browser/ui/settings_window_manager.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ui/settings_window_manager.cc b/chrome/browser/ui/settings_window_manager.cc index c60d5ae..dbe176a 100644 --- a/chrome/browser/ui/settings_window_manager.cc +++ b/chrome/browser/ui/settings_window_manager.cc @@ -35,6 +35,8 @@ void SettingsWindowManager::RemoveObserver( void SettingsWindowManager::ShowChromePageForProfile(Profile* profile, const GURL& gurl) { + // Use the original (non off-the-record) profile for settings. + profile = profile->GetOriginalProfile(); // Look for an existing browser window. Browser* browser = FindBrowserForProfile(profile); if (browser) { @@ -62,6 +64,7 @@ void SettingsWindowManager::ShowChromePageForProfile(Profile* profile, params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE; chrome::Navigate(¶ms); settings_session_map_[profile] = params.browser->session_id().id(); + DCHECK(params.browser->is_trusted_source()); FOR_EACH_OBSERVER(SettingsWindowManagerObserver, observers_, OnNewSettingsWindow(params.browser)); |