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

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2011 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/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 12 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/dom_ui/bug_report_ui.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/ntp_background_util.h"
 #include "chrome/browser/page_info_window.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/sessions/tab_restore_service.h"
 #include "chrome/browser/sidebar/sidebar_container.h"
 #include "chrome/browser/sidebar/sidebar_manager.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/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 2084 matching lines @@
   if (should_show) {
     if (!devtools_focus_tracker_.get()) {
       // Install devtools focus tracker when dev tools window is shown for the
       // first time.
       devtools_focus_tracker_.reset(
           new views::ExternalFocusTracker(devtools_container_,
                                           GetFocusManager()));
     }
 
     // Restore split offset.
-    int split_offset = g_browser_process->local_state()->GetInteger(
-        prefs::kDevToolsSplitLocation);
+    ProfileManager* profile_manager = g_browser_process->profile_manager();
+    int split_offset = profile_manager->GetDefaultProfile()->GetPrefs()->
+        GetInteger(prefs::kDevToolsSplitLocation);
     if (split_offset == -1) {
       // Initial load, set to default value.
       split_offset = 2 * contents_split_->height() / 3;
     }
     // Make sure user can see both panes.
     int min_split_size = contents_split_->height() / 10;
     split_offset = std::min(contents_split_->height() - min_split_size,
                             std::max(min_split_size, split_offset));
     contents_split_->set_divider_offset(split_offset);
 
     devtools_container_->SetVisible(true);
     contents_split_->Layout();
   } else if (should_hide) {
     // Store split offset when hiding devtools window only.
-    g_browser_process->local_state()->SetInteger(
-        prefs::kDevToolsSplitLocation, contents_split_->divider_offset());
+    ProfileManager* profile_manager = g_browser_process->profile_manager();
+    profile_manager->GetDefaultProfile()->GetPrefs()->
+        SetInteger(prefs::kDevToolsSplitLocation,
+                   contents_split_->divider_offset());
 
     // Restore focus to the last focused view when hiding devtools window.
     devtools_focus_tracker_->FocusLastFocusedExternalView();
 
     devtools_container_->SetVisible(false);
     contents_split_->Layout();
   }
 }
 
 void BrowserView::UpdateUIForContents(TabContentsWrapper* contents) {
@@ skipping 414 matching lines @@
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }