Commit cd4f1227 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

DevTools: store devtools split offset only when devtools is being hidden.

Otherwise any browser window closed afterwards will overwrite settings with the original ones.

Review URL: http://codereview.chromium.org/155140

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20026 0039d316-1c4b-4281-b951-d872f2087c98
parent f50c5cfe
...@@ -602,9 +602,6 @@ void BrowserView::Close() { ...@@ -602,9 +602,6 @@ void BrowserView::Close() {
for (; bubble != browser_bubbles_.end(); ++bubble) { for (; bubble != browser_bubbles_.end(); ++bubble) {
(*bubble)->BrowserWindowClosed(); (*bubble)->BrowserWindowClosed();
} }
g_browser_process->local_state()->SetInteger(
prefs::kDevToolsSplitLocation, contents_split_->divider_offset());
} }
void BrowserView::Activate() { void BrowserView::Activate() {
...@@ -1436,6 +1433,7 @@ void BrowserView::Init() { ...@@ -1436,6 +1433,7 @@ void BrowserView::Init() {
contents_container_ = new TabContentsContainer; contents_container_ = new TabContentsContainer;
devtools_container_ = new TabContentsContainer; devtools_container_ = new TabContentsContainer;
devtools_container_->SetVisible(false);
contents_split_ = new views::SingleSplitView( contents_split_ = new views::SingleSplitView(
contents_container_, contents_container_,
devtools_container_, devtools_container_,
...@@ -1607,6 +1605,11 @@ void BrowserView::UpdateDevToolsForContents(TabContents* tab_contents) { ...@@ -1607,6 +1605,11 @@ void BrowserView::UpdateDevToolsForContents(TabContents* tab_contents) {
TabContents* devtools_contents = TabContents* devtools_contents =
DevToolsWindow::GetDevToolsContents(tab_contents); DevToolsWindow::GetDevToolsContents(tab_contents);
devtools_container_->ChangeTabContents(devtools_contents); devtools_container_->ChangeTabContents(devtools_contents);
if (!devtools_contents && devtools_container_->IsVisible()) {
// Store split offset when hiding devtools window only.
g_browser_process->local_state()->SetInteger(
prefs::kDevToolsSplitLocation, contents_split_->divider_offset());
}
devtools_container_->SetVisible(devtools_contents != NULL); devtools_container_->SetVisible(devtools_contents != NULL);
contents_split_->Layout(); contents_split_->Layout();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment