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

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #import "base/scoped_nsobject.h"
 #include "chrome/browser/browser_process.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_widget_host_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
@@ skipping 35 matching lines @@
       initWithView:[self tabStripView]
         switchView:[previewableContentsController_ activeContainer]
            browser:browser_.get()
           delegate:self]);
 }
 
 - (void)saveWindowPositionIfNeeded {
   if (browser_ != BrowserList::GetLastActive())
     return;
 
-  if (!g_browser_process || !g_browser_process->local_state() ||
+  if (!g_browser_process || !g_browser_process->profile_manager() ||
       !browser_->ShouldSaveWindowPlacement())
     return;
 
-  [self saveWindowPositionToPrefs:g_browser_process->local_state()];
+  [self saveWindowPositionToPrefs:g_browser_process->profile_manager()->
+      GetDefaultProfile()->GetPrefs()];
 }
 
 - (void)saveWindowPositionToPrefs:(PrefService*)prefs {
   // If we're in fullscreen mode, save the position of the regular window
   // instead.
   NSWindow* window = [self isFullscreen] ? savedRegularWindow_ : [self window];
 
   // Window positions are stored relative to the origin of the primary monitor.
   NSRect monitorFrame = [[[NSScreen screens] objectAtIndex:0] frame];
   NSScreen* windowScreen = [window screen];
@@ skipping 418 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [fullscreenController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)