diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 17:02:45 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 17:02:45 +0000 |
| commit | 38ab46563875871094169fb1152a8b21ebbf841f (patch) | |
| tree | 1c14d216e0c5ac5621285ea4146b1ec706958bb4 /chrome/browser/debugger | |
| parent | 9cd6def3b735220b4dd0d00ec5c8633a2dfa8acd (diff) | |
| download | chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.zip chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.tar.gz chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.tar.bz2 | |
Reland r41641 "Make DevTools open docked by default..."
- Fix DevToolsSanityTest time out.
The timeout is because the tests wait for Browser closed notification.
However, docked DevTools does not have its own Browser object and
hence the wait times out.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1025005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
| -rw-r--r-- | chrome/browser/debugger/devtools_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc index fe3462e..d4d3971 100644 --- a/chrome/browser/debugger/devtools_manager.cc +++ b/chrome/browser/debugger/devtools_manager.cc @@ -29,7 +29,7 @@ DevToolsManager* DevToolsManager::GetInstance() { // static void DevToolsManager::RegisterUserPrefs(PrefService* prefs) { - prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked, false); + prefs->RegisterBooleanPref(prefs::kDevToolsOpenDocked, true); } DevToolsManager::DevToolsManager() diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index bf7d9f9..d88a0c5 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -137,7 +137,11 @@ class DevToolsSanityTest : public InProcessBrowserTest { // first. Browser* browser = window_->browser(); devtools_manager->UnregisterDevToolsClientHostFor(inspected_rvh_); - BrowserClosedObserver close_observer(browser); + + // Wait only when DevToolsWindow has a browser. For docked DevTools, this + // is NULL and we skip the wait. + if (browser) + BrowserClosedObserver close_observer(browser); } TabContents* client_contents_; |