More WebView / WebViewDelegate cleanup.

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 378 matching lines @@
       prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true);
   prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
                              pref_defaults.loads_images_automatically);
   prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
                              pref_defaults.plugins_enabled);
   prefs->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,
                              pref_defaults.dom_paste_enabled);
   prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit,
                              pref_defaults.shrinks_standalone_images_to_fit);
   prefs->RegisterStringPref(prefs::kWebKitInspectorSettings,
-                            pref_defaults.inspector_settings);
+                            UTF8ToWide(pref_defaults.inspector_settings));
   prefs->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,
                              pref_defaults.text_areas_are_resizable);
   prefs->RegisterBooleanPref(prefs::kWebKitJavaEnabled,
                              pref_defaults.java_enabled);
 
   prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages,
                                      IDS_ACCEPT_LANGUAGES);
   prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset,
                                      IDS_DEFAULT_ENCODING);
   prefs->RegisterLocalizedBooleanPref(prefs::kWebKitStandardFontIsSerif,
@@ skipping 1682 matching lines @@
                                                        score, true);
   } else {
     HistoryService* hs;
     if (!profile()->IsOffTheRecord() &&
         (hs = profile()->GetHistoryService(Profile::IMPLICIT_ACCESS))) {
       hs->SetPageThumbnail(url, bitmap, score);
     }
   }
 }
 
-void TabContents::UpdateInspectorSettings(const std::wstring& raw_settings) {
+void TabContents::UpdateInspectorSettings(const std::string& raw_settings) {
   profile()->GetPrefs()->SetString(prefs::kWebKitInspectorSettings,
-                                   raw_settings);
+                                   UTF8ToWide(raw_settings));
 }
 
 void TabContents::Close(RenderViewHost* rvh) {
   // If we close the tab while we're in the middle of a drag, we'll crash.
   // Instead, cancel the drag and close it as soon as the drag ends.
   if (view()->IsDoingDrag()) {
     view()->CancelDragAndCloseTab();
     return;
   }
 
@@ skipping 455 matching lines @@
 
     default:
       NOTREACHED();
   }
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }