No longer register app window placement preference keys on the fly.

chrome/browser/devtools/devtools_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
@@ skipping 304 matching lines @@
   DCHECK(it != instances->end());
   instances->erase(it);
 
   if (!close_callback_.is_null()) {
     close_callback_.Run();
     close_callback_ = base::Closure();
   }
 }
 
 // static
-std::string DevToolsWindow::GetDevToolsWindowPlacementPrefKey() {
-  return std::string(prefs::kBrowserWindowPlacement) + "_" +
-      std::string(kDevToolsApp);
-}
-
-// static
 void DevToolsWindow::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
       prefs::kDevToolsEditedFiles,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDictionaryPref(
       prefs::kDevToolsFileSystemPaths,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
       prefs::kDevToolsAdbKey, std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
-  registry->RegisterDictionaryPref(
-      GetDevToolsWindowPlacementPrefKey().c_str(),
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-
   registry->RegisterBooleanPref(
       prefs::kDevToolsDiscoverUsbDevicesEnabled,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kDevToolsPortForwardingEnabled,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kDevToolsPortForwardingDefaultSet,
@@ skipping 773 matching lines @@
   if (life_stage_ != kLoadCompleted) {
     // Load is completed when both kIsDockedSet and kOnLoadFired happened.
     // Here we set kOnLoadFired.
     life_stage_ = life_stage_ == kIsDockedSet ? kLoadCompleted : kOnLoadFired;
   }
   if (life_stage_ == kLoadCompleted)
     LoadCompleted();
 }
 
 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 variable with parentheses.
Could you use `=`?

[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(
       profile_,
       chrome::GetHostDesktopTypeForNativeView(
           main_web_contents_->GetNativeView())));
   browser_->tab_strip_model()->AddWebContents(
       main_web_contents_, -1, content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       TabStripModel::ADD_ACTIVE);
   main_web_contents_->GetRenderViewHost()->SyncRendererPrefs();
@@ skipping 74 matching lines @@
       closure.Run();
     return;
   }
   load_completed_callback_ = closure;
 }
 
 bool DevToolsWindow::ForwardKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   return event_forwarder_->ForwardEvent(event);
 }