diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-09 15:31:30 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-09 15:31:30 +0000 |
| commit | 1b91f510fdda3d6e764e0476df5a82c64ae2975e (patch) | |
| tree | 33b5121a765629445cfb312e76a859f7d0c9f2c5 /chrome/browser/debugger/devtools_window.cc | |
| parent | b045a67113c1d3c511aed76d618732d6a251919a (diff) | |
| download | chromium_src-1b91f510fdda3d6e764e0476df5a82c64ae2975e.zip chromium_src-1b91f510fdda3d6e764e0476df5a82c64ae2975e.tar.gz chromium_src-1b91f510fdda3d6e764e0476df5a82c64ae2975e.tar.bz2 | |
DevTools: restore sanity test suite.
BUG=11533
Review URL: http://codereview.chromium.org/119355
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_window.cc')
| -rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 572e493..5dfa557 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -24,30 +24,30 @@ DevToolsWindow::DevToolsWindow(Profile* profile) : TabStripModelObserver(), inspected_tab_closing_(false) { - static std::wstring g_wp_key = L""; - if (g_wp_key.empty()) { - // TODO(pfeldman): Make browser's getter for this key static. - g_wp_key.append(prefs::kBrowserWindowPlacement); - g_wp_key.append(L"_"); - g_wp_key.append(L"DevToolsApp"); - PrefService* prefs = g_browser_process->local_state(); - prefs->RegisterDictionaryPref(g_wp_key.c_str()); + // TODO(pfeldman): Make browser's getter for this key static. + std::wstring wp_key = L""; + wp_key.append(prefs::kBrowserWindowPlacement); + wp_key.append(L"_"); + wp_key.append(L"DevToolsApp"); - const DictionaryValue* wp_pref = prefs->GetDictionary(g_wp_key.c_str()); - if (!wp_pref) { - DictionaryValue* defaults = prefs->GetMutableDictionary( - g_wp_key.c_str()); - defaults->SetInteger(L"left", 100); - defaults->SetInteger(L"top", 100); - defaults->SetInteger(L"right", 740); - defaults->SetInteger(L"bottom", 740); - defaults->SetBoolean(L"maximized", false); - defaults->SetBoolean(L"always_on_top", false); - } + PrefService* prefs = g_browser_process->local_state(); + if (!prefs->FindPreference(wp_key.c_str())) { + prefs->RegisterDictionaryPref(wp_key.c_str()); } - browser_.reset(Browser::CreateForApp(L"DevToolsApp", profile, false)); + const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str()); + if (!wp_pref) { + DictionaryValue* defaults = prefs->GetMutableDictionary(wp_key.c_str()); + defaults->SetInteger(L"left", 100); + defaults->SetInteger(L"top", 100); + defaults->SetInteger(L"right", 740); + defaults->SetInteger(L"bottom", 740); + defaults->SetBoolean(L"maximized", false); + defaults->SetBoolean(L"always_on_top", false); + } + + browser_ = Browser::CreateForApp(L"DevToolsApp", profile, false); GURL contents(std::string(chrome::kChromeUIDevToolsURL) + "devtools.html"); browser_->AddTabWithURL(contents, GURL(), PageTransition::START_PAGE, true, -1, false, NULL); @@ -93,9 +93,8 @@ void DevToolsWindow::TabClosingAt(TabContents* contents, int index) { // Notify manager that this DevToolsClientHost no longer exists. NotifyCloseListener(); } - if (browser_->tabstrip_model()->empty()) { - // We are removing the last tab. Delete browser along with the - // tabstrip_model and its listeners. - delete this; - } +} + +void DevToolsWindow::TabStripEmpty() { + delete this; } |