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

chrome/browser/ui/cocoa/dev_tools_controller.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/dev_tools_controller.h"
 
 #include <algorithm>
 
 #include <Cocoa/Cocoa.h>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // Default offset of the contents splitter in pixels.
 const int kDefaultContentsSplitOffset = 400;
 
 // Never make the web part of the tab contents smaller than this (needed if the
 // window is only a few pixels high).
 const int kMinWebHeight = 50;
 
 }  // end namespace
 
 
 @interface DevToolsController (Private)
-- (void)showDevToolsContents:(TabContents*)devToolsContents;
+- (void)showDevToolsContents:(TabContents*)devToolsContents
+                 withProfile:(Profile*)profile;
 - (void)resizeDevToolsToNewHeight:(CGFloat)height;
 @end
 
 
 @implementation DevToolsController
 
 - (id)initWithDelegate:(id<TabContentsControllerDelegate>)delegate {
   if ((self = [super init])) {
     splitView_.reset([[NSSplitView alloc] initWithFrame:NSZeroRect]);
     [splitView_ setDividerStyle:NSSplitViewDividerStyleThin];
@@ skipping 14 matching lines @@
 }
 
 - (NSView*)view {
   return splitView_.get();
 }
 
 - (NSSplitView*)splitView {
   return splitView_.get();
 }
 
-- (void)updateDevToolsForTabContents:(TabContents*)contents {
+- (void)updateDevToolsForTabContents:(TabContents*)contents
+                         withProfile:(Profile*)profile {
   // Get current devtools content.
   TabContents* devToolsContents = contents ?
       DevToolsWindow::GetDevToolsContents(contents) : NULL;
 
-  [self showDevToolsContents:devToolsContents];
+  [self showDevToolsContents:devToolsContents withProfile:profile];
 }
 
 - (void)ensureContentsVisible {
   [contentsController_ ensureContentsVisible];
 }
 
-- (void)showDevToolsContents:(TabContents*)devToolsContents {
+- (void)showDevToolsContents:(TabContents*)devToolsContents
+                 withProfile:(Profile*)profile {
   [contentsController_ ensureContentsSizeDoesNotChange];
 
   NSArray* subviews = [splitView_ subviews];
   if (devToolsContents) {
     DCHECK_GE([subviews count], 1u);
 
     // |devToolsView| is a TabContentsViewCocoa object, whose ViewID was
     // set to VIEW_ID_TAB_CONTAINER initially, so we need to change it to
     // VIEW_ID_DEV_TOOLS_DOCKED here.
     view_id_util::SetID(
         devToolsContents->GetNativeView(), VIEW_ID_DEV_TOOLS_DOCKED);
 
     CGFloat splitOffset = 0;
     if ([subviews count] == 1) {
       // Load the default split offset.
-      splitOffset = g_browser_process->local_state()->GetInteger(
-          prefs::kDevToolsSplitLocation);
+      splitOffset = profile->GetPrefs()->
+          GetInteger(prefs::kDevToolsSplitLocation);
       if (splitOffset < 0) {
         // Initial load, set to default value.
         splitOffset = kDefaultContentsSplitOffset;
       }
       [splitView_ addSubview:[contentsController_ view]];
     } else {
       DCHECK_EQ([subviews count], 2u);
       // If devtools are already visible, keep the current size.
       splitOffset = NSHeight([[subviews objectAtIndex:1] frame]);
     }
 
     // Make sure |splitOffset| isn't too large or too small.
     splitOffset = std::max(static_cast<CGFloat>(kMinWebHeight), splitOffset);
     splitOffset =
         std::min(splitOffset, NSHeight([splitView_ frame]) - kMinWebHeight);
     DCHECK_GE(splitOffset, 0) << "kMinWebHeight needs to be smaller than "
                               << "smallest available tab contents space.";
 
     [self resizeDevToolsToNewHeight:splitOffset];
   } else {
     if ([subviews count] > 1) {
       NSView* oldDevToolsContentsView = [subviews objectAtIndex:1];
       // Store split offset when hiding devtools window only.
       int splitOffset = NSHeight([oldDevToolsContentsView frame]);
-      g_browser_process->local_state()->SetInteger(
+
+      profile->GetPrefs()->SetInteger(
           prefs::kDevToolsSplitLocation, splitOffset);
       [oldDevToolsContentsView removeFromSuperview];
       [splitView_ adjustSubviews];
     }
   }
 
   [contentsController_ changeTabContents:devToolsContents];
 }
 
 - (void)resizeDevToolsToNewHeight:(CGFloat)height {
@@ skipping 23 matching lines @@
   // Return NO for the devTools view to indicate that it should not be resized
   // automatically. It preserves the height set by the user and also keeps
   // view height the same while changing tabs when one of the tabs shows infobar
   // and others are not.
   if ([[splitView_ subviews] indexOfObject:subview] == 1)
     return NO;
   return YES;
 }
 
 @end