diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 23:33:08 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 23:33:08 +0000 |
| commit | eca25813c3bd229f1a7923219d94d53bf71ac0bd (patch) | |
| tree | a4753edfa57b572604f2abd0bdca45166d9678d7 /chrome/browser/dom_ui | |
| parent | 98546a1e47d36c0fc96d45c45eb9e95e7d24273e (diff) | |
| download | chromium_src-eca25813c3bd229f1a7923219d94d53bf71ac0bd.zip chromium_src-eca25813c3bd229f1a7923219d94d53bf71ac0bd.tar.gz chromium_src-eca25813c3bd229f1a7923219d94d53bf71ac0bd.tar.bz2 | |
Don't show tabbed options page or bookmarks manager in OTR browser window.
Instead, always show it in a normal window (creating one if necessary).
The change is made in BrowserNavigator because that is the control flow bottleneck.
BUG=61813
TEST=manual
Review URL: http://codereview.chromium.org/4655002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/options/options_ui.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc index 0ee7188..009c0e1 100644 --- a/chrome/browser/dom_ui/options/options_ui.cc +++ b/chrome/browser/dom_ui/options/options_ui.cc @@ -240,6 +240,8 @@ RefCountedMemory* OptionsUI::GetFaviconResourceBytes() { } void OptionsUI::InitializeHandlers() { + DCHECK(!GetProfile()->IsOffTheRecord()); + std::vector<DOMMessageHandler*>::iterator iter; for (iter = handlers_.begin(); iter != handlers_.end(); ++iter) { (static_cast<OptionsPageUIHandler*>(*iter))->Initialize(); |