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/webui/options/browser_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "apps/app_window.h" | 10 #include "apps/app_window.h" |
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
789 OnStateChanged(); | 789 OnStateChanged(); |
790 } | 790 } |
791 | 791 |
792 void BrowserOptionsHandler::PageLoadStarted() { | 792 void BrowserOptionsHandler::PageLoadStarted() { |
793 page_initialized_ = false; | 793 page_initialized_ = false; |
794 } | 794 } |
795 | 795 |
796 void BrowserOptionsHandler::InitializeHandler() { | 796 void BrowserOptionsHandler::InitializeHandler() { |
797 Profile* profile = Profile::FromWebUI(web_ui()); | 797 Profile* profile = Profile::FromWebUI(web_ui()); |
798 PrefService* prefs = profile->GetPrefs(); | 798 PrefService* prefs = profile->GetPrefs(); |
| 799 PrefService* zoom_level_prefs = profile->GetZoomLevelPrefs(); |
| 800 DCHECK(zoom_level_prefs); |
799 | 801 |
800 ProfileSyncService* sync_service( | 802 ProfileSyncService* sync_service( |
801 ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile)); | 803 ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile)); |
802 // TODO(blundell): Use a ScopedObserver to observe the PSS so that cleanup on | 804 // TODO(blundell): Use a ScopedObserver to observe the PSS so that cleanup on |
803 // destruction is automatic. | 805 // destruction is automatic. |
804 if (sync_service) | 806 if (sync_service) |
805 sync_service->AddObserver(this); | 807 sync_service->AddObserver(this); |
806 | 808 |
807 SigninManagerBase* signin_manager( | 809 SigninManagerBase* signin_manager( |
808 SigninManagerFactory::GetInstance()->GetForProfile(profile)); | 810 SigninManagerFactory::GetInstance()->GetForProfile(profile)); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
842 weak_ptr_factory_.GetWeakPtr(), | 844 weak_ptr_factory_.GetWeakPtr(), |
843 profile->GetPath())); | 845 profile->GetPath())); |
844 } | 846 } |
845 #endif | 847 #endif |
846 | 848 |
847 auto_open_files_.Init( | 849 auto_open_files_.Init( |
848 prefs::kDownloadExtensionsToOpen, prefs, | 850 prefs::kDownloadExtensionsToOpen, prefs, |
849 base::Bind(&BrowserOptionsHandler::SetupAutoOpenFileTypes, | 851 base::Bind(&BrowserOptionsHandler::SetupAutoOpenFileTypes, |
850 base::Unretained(this))); | 852 base::Unretained(this))); |
851 default_zoom_level_.Init( | 853 default_zoom_level_.Init( |
852 prefs::kDefaultZoomLevel, prefs, | 854 prefs::kDefaultZoomLevel, |
| 855 zoom_level_prefs, |
853 base::Bind(&BrowserOptionsHandler::SetupPageZoomSelector, | 856 base::Bind(&BrowserOptionsHandler::SetupPageZoomSelector, |
854 base::Unretained(this))); | 857 base::Unretained(this))); |
855 profile_pref_registrar_.Init(prefs); | 858 profile_pref_registrar_.Init(prefs); |
856 profile_pref_registrar_.Add( | 859 profile_pref_registrar_.Add( |
857 prefs::kNetworkPredictionOptions, | 860 prefs::kNetworkPredictionOptions, |
858 base::Bind(&BrowserOptionsHandler::SetupNetworkPredictionControl, | 861 base::Bind(&BrowserOptionsHandler::SetupNetworkPredictionControl, |
859 base::Unretained(this))); | 862 base::Unretained(this))); |
860 profile_pref_registrar_.Add( | 863 profile_pref_registrar_.Add( |
861 prefs::kWebKitDefaultFontSize, | 864 prefs::kWebKitDefaultFontSize, |
862 base::Bind(&BrowserOptionsHandler::SetupFontSizeSelector, | 865 base::Bind(&BrowserOptionsHandler::SetupFontSizeSelector, |
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1726 dict.SetString("controlledBy", "policy"); | 1729 dict.SetString("controlledBy", "policy"); |
1727 } else if (default_font_size->IsExtensionControlled() || | 1730 } else if (default_font_size->IsExtensionControlled() || |
1728 default_fixed_font_size->IsExtensionControlled()) { | 1731 default_fixed_font_size->IsExtensionControlled()) { |
1729 dict.SetString("controlledBy", "extension"); | 1732 dict.SetString("controlledBy", "extension"); |
1730 } | 1733 } |
1731 | 1734 |
1732 web_ui()->CallJavascriptFunction("BrowserOptions.setFontSize", dict); | 1735 web_ui()->CallJavascriptFunction("BrowserOptions.setFontSize", dict); |
1733 } | 1736 } |
1734 | 1737 |
1735 void BrowserOptionsHandler::SetupPageZoomSelector() { | 1738 void BrowserOptionsHandler::SetupPageZoomSelector() { |
1736 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); | 1739 double default_zoom_level = |
1737 double default_zoom_level = pref_service->GetDouble(prefs::kDefaultZoomLevel); | 1740 Profile::FromWebUI(web_ui())->GetDefaultZoomLevel(); |
1738 double default_zoom_factor = | 1741 double default_zoom_factor = |
1739 content::ZoomLevelToZoomFactor(default_zoom_level); | 1742 content::ZoomLevelToZoomFactor(default_zoom_level); |
1740 | 1743 |
1741 // Generate a vector of zoom factors from an array of known presets along with | 1744 // Generate a vector of zoom factors from an array of known presets along with |
1742 // the default factor added if necessary. | 1745 // the default factor added if necessary. |
1743 std::vector<double> zoom_factors = | 1746 std::vector<double> zoom_factors = |
1744 chrome_page_zoom::PresetZoomFactors(default_zoom_factor); | 1747 chrome_page_zoom::PresetZoomFactors(default_zoom_factor); |
1745 | 1748 |
1746 // Iterate through the zoom factors and and build the contents of the | 1749 // Iterate through the zoom factors and and build the contents of the |
1747 // selector that will be sent to the javascript handler. | 1750 // selector that will be sent to the javascript handler. |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1883 extension = extensions::GetExtensionOverridingProxy( | 1886 extension = extensions::GetExtensionOverridingProxy( |
1884 Profile::FromWebUI(web_ui())); | 1887 Profile::FromWebUI(web_ui())); |
1885 AppendExtensionData("proxy", extension, &extension_controlled); | 1888 AppendExtensionData("proxy", extension, &extension_controlled); |
1886 | 1889 |
1887 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", | 1890 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", |
1888 extension_controlled); | 1891 extension_controlled); |
1889 #endif // defined(OS_WIN) | 1892 #endif // defined(OS_WIN) |
1890 } | 1893 } |
1891 | 1894 |
1892 } // namespace options | 1895 } // namespace options |
OLD | NEW |