Chromium Code Reviews| Index: chrome/browser/devtools/devtools_window.cc |
| diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc |
| index 16ffe909dfb3463df09ef27d71737dae5f9eb2d4..5f450328f42a4029b26b7c6b4be87133e66ba436 100644 |
| --- a/chrome/browser/devtools/devtools_window.cc |
| +++ b/chrome/browser/devtools/devtools_window.cc |
| @@ -322,12 +322,6 @@ DevToolsWindow::~DevToolsWindow() { |
| } |
| // static |
| -std::string DevToolsWindow::GetDevToolsWindowPlacementPrefKey() { |
| - return std::string(prefs::kBrowserWindowPlacement) + "_" + |
| - std::string(kDevToolsApp); |
| -} |
| - |
| -// static |
| void DevToolsWindow::RegisterProfilePrefs( |
| user_prefs::PrefRegistrySyncable* registry) { |
| registry->RegisterDictionaryPref( |
| @@ -340,10 +334,6 @@ void DevToolsWindow::RegisterProfilePrefs( |
| prefs::kDevToolsAdbKey, std::string(), |
| user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| - registry->RegisterDictionaryPref( |
| - GetDevToolsWindowPlacementPrefKey().c_str(), |
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| - |
| registry->RegisterBooleanPref( |
| prefs::kDevToolsDiscoverUsbDevicesEnabled, |
| true, |
| @@ -1137,18 +1127,19 @@ void DevToolsWindow::OnLoadCompleted() { |
| } |
| void DevToolsWindow::CreateDevToolsBrowser() { |
| - std::string wp_key = GetDevToolsWindowPlacementPrefKey(); |
| + const char* wp_key(prefs::kAppWindowPlacement); |
|
Bernhard Bauer
2014/09/04 11:06:02
Nit: it feels weird to me to initialize a pointer
dgrogan
2014/09/04 20:26:33
Done.
|
| PrefService* prefs = profile_->GetPrefs(); |
| - const base::DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str()); |
| - if (!wp_pref || wp_pref->empty()) { |
| - DictionaryPrefUpdate update(prefs, wp_key.c_str()); |
| - base::DictionaryValue* defaults = update.Get(); |
| - defaults->SetInteger("left", 100); |
| - defaults->SetInteger("top", 100); |
| - defaults->SetInteger("right", 740); |
| - defaults->SetInteger("bottom", 740); |
| - defaults->SetBoolean("maximized", false); |
| - defaults->SetBoolean("always_on_top", false); |
| + if (!prefs->GetDictionary(wp_key)->GetDictionary(kDevToolsApp, NULL)) { |
|
Bernhard Bauer
2014/09/04 11:06:02
You can use DictionaryValue::HasKey.
dgrogan
2014/09/04 20:26:33
Done.
|
| + DictionaryPrefUpdate update(prefs, wp_key); |
| + base::DictionaryValue* wp_prefs = update.Get(); |
| + base::DictionaryValue* dev_tools_defaults = new base::DictionaryValue; |
| + wp_prefs->Set(kDevToolsApp, dev_tools_defaults); |
| + dev_tools_defaults->SetInteger("left", 100); |
| + dev_tools_defaults->SetInteger("top", 100); |
| + dev_tools_defaults->SetInteger("right", 740); |
| + dev_tools_defaults->SetInteger("bottom", 740); |
| + dev_tools_defaults->SetBoolean("maximized", false); |
| + dev_tools_defaults->SetBoolean("always_on_top", false); |
| } |
| browser_ = new Browser(Browser::CreateParams::CreateForDevTools( |