Remove user-related data from local_state and add to user_preferences, i...

chrome/browser/debugger/devtools_window.cc

 // Copyright (c) 2010 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 "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/in_process_webkit/session_storage_namespace.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/bindings_policy.h"
@@ skipping 179 matching lines @@
   return tab_contents_->render_view_host();
 }
 
 void DevToolsWindow::CreateDevToolsBrowser() {
   // TODO(pfeldman): Make browser's getter for this key static.
   std::string wp_key;
   wp_key.append(prefs::kBrowserWindowPlacement);
   wp_key.append("_");
   wp_key.append(kDevToolsApp);
 
-  PrefService* prefs = g_browser_process->local_state();
-  if (!prefs->FindPreference(wp_key.c_str())) {
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  if (profile_manager) {
+    PrefService* prefs = profile_manager->GetDefaultProfile()->GetPrefs();
     prefs->RegisterDictionaryPref(wp_key.c_str());

[apavlov, 2011/01/18 00:33:03]

I have no relation to this code, but the FindPreference() thing seems to be
missing altogether. I'd suggest that yurys@chromium.org or pfeldman@chromium.org
have a look at this change.

-  }
 
-  const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str());
-  if (!wp_pref) {
-    DictionaryValue* defaults = prefs->GetMutableDictionary(wp_key.c_str());
-    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);
+    const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str());
+    if (!wp_pref) {
+      DictionaryValue* defaults = prefs->GetMutableDictionary(wp_key.c_str());
+      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);
+    }
+  } else {
+    NOTREACHED() << "browser process does not have a ProfileManager.";
   }
 
   browser_ = Browser::CreateForDevTools(profile_);
   browser_->tabstrip_model()->AddTabContents(
       tab_contents_, -1, PageTransition::START_PAGE,
       TabStripModel::ADD_SELECTED);
 }
 
 bool DevToolsWindow::FindInspectedBrowserAndTabIndex(Browser** browser,
                                                      int* tab) {
@@ skipping 167 matching lines @@
   return false;
 }
 
 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
   if (docked_) {
     BrowserWindow* inspected_window = GetInspectedBrowserWindow();
     if (inspected_window)
       inspected_window->HandleKeyboardEvent(event);
   }
 }