Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test compilation. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 5 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/prefs/overlay_user_pref_store.h" 9 #include "base/prefs/overlay_user_pref_store.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 else 309 else
310 NOTREACHED() << "Unknown generic font family: " << generic_family; 310 NOTREACHED() << "Unknown generic font family: " << generic_family;
311 (*map)[script] = base::UTF8ToUTF16(pref_value); 311 (*map)[script] = base::UTF8ToUTF16(pref_value);
312 } 312 }
313 313
314 } // namespace 314 } // namespace
315 315
316 PrefsTabHelper::PrefsTabHelper(WebContents* contents) 316 PrefsTabHelper::PrefsTabHelper(WebContents* contents)
317 : web_contents_(contents), 317 : web_contents_(contents),
318 weak_ptr_factory_(this) { 318 weak_ptr_factory_(this) {
319 PrefService* zoom_level_prefs = GetProfile()->GetZoomLevelPrefs();
320 if (zoom_level_prefs) {
321 zoom_level_pref_change_registrar_.Init(zoom_level_prefs);
322 base::Closure renderer_callback = base::Bind(
323 &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this));
324 zoom_level_pref_change_registrar_.Add(prefs::kDefaultZoomLevel,
325 renderer_callback);
326 }
327
319 PrefService* prefs = GetProfile()->GetPrefs(); 328 PrefService* prefs = GetProfile()->GetPrefs();
320 pref_change_registrar_.Init(prefs); 329 pref_change_registrar_.Init(prefs);
321 if (prefs) { 330 if (prefs) {
322 base::Closure renderer_callback = base::Bind( 331 base::Closure renderer_callback = base::Bind(
323 &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this)); 332 &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this));
324 pref_change_registrar_.Add(prefs::kAcceptLanguages, renderer_callback); 333 pref_change_registrar_.Add(prefs::kAcceptLanguages, renderer_callback);
325 pref_change_registrar_.Add(prefs::kDefaultZoomLevel, renderer_callback);
326 pref_change_registrar_.Add(prefs::kEnableDoNotTrack, renderer_callback); 334 pref_change_registrar_.Add(prefs::kEnableDoNotTrack, renderer_callback);
327 pref_change_registrar_.Add(prefs::kEnableReferrers, renderer_callback); 335 pref_change_registrar_.Add(prefs::kEnableReferrers, renderer_callback);
328 336
329 #if !defined(OS_MACOSX) 337 #if !defined(OS_MACOSX)
330 pref_change_registrar_.Add(prefs::kFullscreenAllowed, renderer_callback); 338 pref_change_registrar_.Add(prefs::kFullscreenAllowed, renderer_callback);
331 #endif 339 #endif
332 340
333 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind( 341 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind(
334 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this)); 342 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this));
335 for (int i = 0; i < kPrefsToObserveLength; ++i) { 343 for (int i = 0; i < kPrefsToObserveLength; ++i) {
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 } 618 }
611 } 619 }
612 620
613 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) { 621 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) {
614 #if !defined(OS_ANDROID) 622 #if !defined(OS_ANDROID)
615 OnFontFamilyPrefChanged(pref_name); 623 OnFontFamilyPrefChanged(pref_name);
616 #endif 624 #endif
617 625
618 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged(); 626 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged();
619 } 627 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698