OLD | NEW |
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" |
11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/renderer_preferences_util.h" | 17 #include "chrome/browser/renderer_preferences_util.h" |
| 18 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" |
| 19 #include "chrome/browser/ui/zoom/zoom_controller.h" |
18 #include "chrome/common/pref_font_webkit_names.h" | 20 #include "chrome/common/pref_font_webkit_names.h" |
19 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
20 #include "chrome/common/pref_names_util.h" | 22 #include "chrome/common/pref_names_util.h" |
21 #include "chrome/grit/locale_settings.h" | 23 #include "chrome/grit/locale_settings.h" |
22 #include "components/pref_registry/pref_registry_syncable.h" | 24 #include "components/pref_registry/pref_registry_syncable.h" |
23 #include "content/public/browser/notification_details.h" | 25 #include "content/public/browser/notification_details.h" |
24 #include "content/public/browser/notification_service.h" | 26 #include "content/public/browser/notification_service.h" |
25 #include "content/public/browser/render_view_host.h" | 27 #include "content/public/browser/render_view_host.h" |
26 #include "content/public/browser/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
| 29 #include "content/public/common/renderer_preferences.h" |
27 #include "content/public/common/web_preferences.h" | 30 #include "content/public/common/web_preferences.h" |
28 #include "grit/platform_locale_settings.h" | 31 #include "grit/platform_locale_settings.h" |
29 #include "third_party/icu/source/common/unicode/uchar.h" | 32 #include "third_party/icu/source/common/unicode/uchar.h" |
30 #include "third_party/icu/source/common/unicode/uscript.h" | 33 #include "third_party/icu/source/common/unicode/uscript.h" |
31 #include "ui/base/l10n/l10n_util.h" | 34 #include "ui/base/l10n/l10n_util.h" |
32 | 35 |
33 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) | 36 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) |
34 #include "chrome/browser/themes/theme_service.h" | 37 #include "chrome/browser/themes/theme_service.h" |
35 #include "chrome/browser/themes/theme_service_factory.h" | 38 #include "chrome/browser/themes/theme_service_factory.h" |
36 #endif | 39 #endif |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 } | 314 } |
312 | 315 |
313 } // namespace | 316 } // namespace |
314 | 317 |
315 PrefsTabHelper::PrefsTabHelper(WebContents* contents) | 318 PrefsTabHelper::PrefsTabHelper(WebContents* contents) |
316 : web_contents_(contents), | 319 : web_contents_(contents), |
317 weak_ptr_factory_(this) { | 320 weak_ptr_factory_(this) { |
318 PrefService* prefs = GetProfile()->GetPrefs(); | 321 PrefService* prefs = GetProfile()->GetPrefs(); |
319 pref_change_registrar_.Init(prefs); | 322 pref_change_registrar_.Init(prefs); |
320 if (prefs) { | 323 if (prefs) { |
| 324 // TODO(wjmaclean): Convert this to use the content-specific zoom-level |
| 325 // prefs when HostZoomMap moves to StoragePartition. |
| 326 chrome::ChromeZoomLevelPrefs* zoom_level_prefs = |
| 327 GetProfile()->GetZoomLevelPrefs(); |
| 328 |
321 base::Closure renderer_callback = base::Bind( | 329 base::Closure renderer_callback = base::Bind( |
322 &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this)); | 330 &PrefsTabHelper::UpdateRendererPreferences, base::Unretained(this)); |
| 331 // Incognito mode does not have a zoom_level_prefs, and not all tests |
| 332 // should need to create one either. |
| 333 if (zoom_level_prefs) { |
| 334 default_zoom_level_subscription_ = |
| 335 zoom_level_prefs->RegisterDefaultZoomLevelCallback(renderer_callback); |
| 336 } |
323 pref_change_registrar_.Add(prefs::kAcceptLanguages, renderer_callback); | 337 pref_change_registrar_.Add(prefs::kAcceptLanguages, renderer_callback); |
324 pref_change_registrar_.Add(prefs::kDefaultZoomLevel, renderer_callback); | |
325 pref_change_registrar_.Add(prefs::kEnableDoNotTrack, renderer_callback); | 338 pref_change_registrar_.Add(prefs::kEnableDoNotTrack, renderer_callback); |
326 pref_change_registrar_.Add(prefs::kEnableReferrers, renderer_callback); | 339 pref_change_registrar_.Add(prefs::kEnableReferrers, renderer_callback); |
327 | 340 |
328 #if !defined(OS_MACOSX) | 341 #if !defined(OS_MACOSX) |
329 pref_change_registrar_.Add(prefs::kFullscreenAllowed, renderer_callback); | 342 pref_change_registrar_.Add(prefs::kFullscreenAllowed, renderer_callback); |
330 #endif | 343 #endif |
331 | 344 |
332 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind( | 345 PrefChangeRegistrar::NamedChangeCallback webkit_callback = base::Bind( |
333 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this)); | 346 &PrefsTabHelper::OnWebPrefChanged, base::Unretained(this)); |
334 for (int i = 0; i < kPrefsToObserveLength; ++i) { | 347 for (int i = 0; i < kPrefsToObserveLength; ++i) { |
(...skipping 17 matching lines...) Expand all Loading... |
352 prefs::kWebKitCursiveFontFamilyMap, | 365 prefs::kWebKitCursiveFontFamilyMap, |
353 webkit_callback); | 366 webkit_callback); |
354 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 367 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
355 prefs::kWebKitFantasyFontFamilyMap, | 368 prefs::kWebKitFantasyFontFamilyMap, |
356 webkit_callback); | 369 webkit_callback); |
357 RegisterFontFamilyMapObserver(&pref_change_registrar_, | 370 RegisterFontFamilyMapObserver(&pref_change_registrar_, |
358 prefs::kWebKitPictographFontFamilyMap, | 371 prefs::kWebKitPictographFontFamilyMap, |
359 webkit_callback); | 372 webkit_callback); |
360 } | 373 } |
361 | 374 |
362 renderer_preferences_util::UpdateFromSystemSettings( | 375 content::RendererPreferences* render_prefs = |
363 web_contents_->GetMutableRendererPrefs(), GetProfile()); | 376 web_contents_->GetMutableRendererPrefs(); |
| 377 renderer_preferences_util::UpdateFromSystemSettings(render_prefs, |
| 378 GetProfile(), |
| 379 web_contents_); |
364 | 380 |
365 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) | 381 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) |
366 registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, | 382 registrar_.Add(this, |
| 383 chrome::NOTIFICATION_BROWSER_THEME_CHANGED, |
367 content::Source<ThemeService>( | 384 content::Source<ThemeService>( |
368 ThemeServiceFactory::GetForProfile(GetProfile()))); | 385 ThemeServiceFactory::GetForProfile(GetProfile()))); |
369 #endif | 386 #endif |
370 #if defined(USE_AURA) | 387 #if defined(USE_AURA) |
371 registrar_.Add(this, | 388 registrar_.Add(this, |
372 chrome::NOTIFICATION_BROWSER_FLING_CURVE_PARAMETERS_CHANGED, | 389 chrome::NOTIFICATION_BROWSER_FLING_CURVE_PARAMETERS_CHANGED, |
373 content::NotificationService::AllSources()); | 390 content::NotificationService::AllSources()); |
374 #endif | 391 #endif |
375 } | 392 } |
376 | 393 |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 | 577 |
561 NOTREACHED(); | 578 NOTREACHED(); |
562 } | 579 } |
563 | 580 |
564 void PrefsTabHelper::UpdateWebPreferences() { | 581 void PrefsTabHelper::UpdateWebPreferences() { |
565 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences( | 582 web_contents_->GetRenderViewHost()->UpdateWebkitPreferences( |
566 web_contents_->GetRenderViewHost()->GetWebkitPreferences()); | 583 web_contents_->GetRenderViewHost()->GetWebkitPreferences()); |
567 } | 584 } |
568 | 585 |
569 void PrefsTabHelper::UpdateRendererPreferences() { | 586 void PrefsTabHelper::UpdateRendererPreferences() { |
| 587 content::RendererPreferences* prefs = |
| 588 web_contents_->GetMutableRendererPrefs(); |
570 renderer_preferences_util::UpdateFromSystemSettings( | 589 renderer_preferences_util::UpdateFromSystemSettings( |
571 web_contents_->GetMutableRendererPrefs(), GetProfile()); | 590 prefs, GetProfile(), web_contents_); |
572 web_contents_->GetRenderViewHost()->SyncRendererPrefs(); | 591 web_contents_->GetRenderViewHost()->SyncRendererPrefs(); |
573 } | 592 } |
574 | 593 |
575 Profile* PrefsTabHelper::GetProfile() { | 594 Profile* PrefsTabHelper::GetProfile() { |
576 return Profile::FromBrowserContext(web_contents_->GetBrowserContext()); | 595 return Profile::FromBrowserContext(web_contents_->GetBrowserContext()); |
577 } | 596 } |
578 | 597 |
579 void PrefsTabHelper::OnFontFamilyPrefChanged(const std::string& pref_name) { | 598 void PrefsTabHelper::OnFontFamilyPrefChanged(const std::string& pref_name) { |
580 // When a font family pref's value goes from non-empty to the empty string, we | 599 // When a font family pref's value goes from non-empty to the empty string, we |
581 // must add it to the usual WebPreferences struct passed to the renderer. | 600 // must add it to the usual WebPreferences struct passed to the renderer. |
(...skipping 24 matching lines...) Expand all Loading... |
606 } | 625 } |
607 } | 626 } |
608 | 627 |
609 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) { | 628 void PrefsTabHelper::OnWebPrefChanged(const std::string& pref_name) { |
610 #if !defined(OS_ANDROID) | 629 #if !defined(OS_ANDROID) |
611 OnFontFamilyPrefChanged(pref_name); | 630 OnFontFamilyPrefChanged(pref_name); |
612 #endif | 631 #endif |
613 | 632 |
614 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged(); | 633 web_contents_->GetRenderViewHost()->OnWebkitPreferencesChanged(); |
615 } | 634 } |
OLD | NEW |