diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:24:49 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:24:49 +0000 |
commit | d33a47ce26330b024214b0ecfb8b2c5cda218233 (patch) | |
tree | cf2e53aa1f65c379095199c252c20630553c775d /chrome/browser/views/frame | |
parent | 7b7bbbe82533e74b60a924dc4d563f6d3f07482c (diff) | |
download | chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.zip chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.tar.gz chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.tar.bz2 |
Revert "Make DevTools open docked by default for chrome os."
This reverts commit r41641 because all the devtools interactive_ui_tests
are failing.
TBR=xiyuan
Review URL: http://codereview.chromium.org/1007004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
-rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 53b058c..3a05746 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -678,6 +678,19 @@ void BrowserView::Show() { // that should be added and this should be removed. RestoreFocus(); + // Restore split offset. + int split_offset = g_browser_process->local_state()->GetInteger( + prefs::kDevToolsSplitLocation); + if (split_offset == -1) { + // Initial load, set to default value. + split_offset = 2 * contents_split_->height() / 3; + } + // Make sure user can see both panes. + int min_split_size = contents_split_->height() / 10; + split_offset = std::min(contents_split_->height() - min_split_size, + std::max(min_split_size, split_offset)); + contents_split_->set_divider_offset(split_offset); + frame_->GetWindow()->Show(); } @@ -1802,20 +1815,6 @@ void BrowserView::UpdateDevToolsForContents(TabContents* tab_contents) { new views::ExternalFocusTracker(devtools_container_, GetFocusManager())); } - - // Restore split offset. - int split_offset = g_browser_process->local_state()->GetInteger( - prefs::kDevToolsSplitLocation); - if (split_offset == -1) { - // Initial load, set to default value. - split_offset = 2 * contents_split_->height() / 3; - } - // Make sure user can see both panes. - int min_split_size = contents_split_->height() / 10; - split_offset = std::min(contents_split_->height() - min_split_size, - std::max(min_split_size, split_offset)); - contents_split_->set_divider_offset(split_offset); - devtools_container_->SetVisible(true); contents_split_->Layout(); } else if (should_hide) { |