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

chrome/browser/ui/window_sizer.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 "chrome/browser/ui/window_sizer.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/pref_names.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // An implementation of WindowSizer::StateProvider that gets the last active
 // and persistent state from the browser window and the user's profile.
 class DefaultStateProvider : public WindowSizer::StateProvider {
  public:
   explicit DefaultStateProvider(const std::string& app_name, Browser* browser)
       : app_name_(app_name),
         browser_(browser) {
   }
 
   // Overridden from WindowSizer::StateProvider:
   virtual bool GetPersistentState(gfx::Rect* bounds,
                                   bool* maximized,
                                   gfx::Rect* work_area) const {
     DCHECK(bounds && maximized);
 
     std::string key(prefs::kBrowserWindowPlacement);
     if (!app_name_.empty()) {
       key.append("_");
       key.append(app_name_);
     }
 
-    if (!g_browser_process->local_state())
+    ProfileManager* profile_manager = g_browser_process->profile_manager();
+    if (!profile_manager)
       return false;
 
     const DictionaryValue* wp_pref =
-        g_browser_process->local_state()->GetDictionary(key.c_str());
+        profile_manager->GetDefaultProfile()->GetPrefs()->GetDictionary(
+            key.c_str());
     int top = 0, left = 0, bottom = 0, right = 0;
     bool has_prefs =
         wp_pref &&
         wp_pref->GetInteger("top", &top) &&
         wp_pref->GetInteger("left", &left) &&
         wp_pref->GetInteger("bottom", &bottom) &&
         wp_pref->GetInteger("right", &right) &&
         wp_pref->GetBoolean("maximized", maximized);
     bounds->SetRect(left, top, std::max(0, right - left),
                     std::max(0, bottom - top));
@@ skipping 276 matching lines @@
   // On non-Mac platforms, we are less aggressive about repositioning.  Simply
   // ensure that at least kMinVisibleWidth * kMinVisibleHeight is visible.
   const int min_y = work_area.y() + kMinVisibleHeight - bounds->height();
   const int min_x = work_area.x() + kMinVisibleWidth - bounds->width();
   const int max_y = work_area.bottom() - kMinVisibleHeight;
   const int max_x = work_area.right() - kMinVisibleWidth;
   bounds->set_y(std::max(min_y, std::min(max_y, bounds->y())));
   bounds->set_x(std::max(min_x, std::min(max_x, bounds->x())));
 #endif  // defined(OS_MACOSX)
 }