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

Unified Diff: chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc

Issue 541103002: Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address final prefs-related comments. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
new file mode 100644
index 0000000000000000000000000000000000000000..66d34361402d420722b76c3004449ea6236da6f0
--- /dev/null
+++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
@@ -0,0 +1,181 @@
+// Copyright (c) 2014 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/zoom/chrome_zoom_level_prefs.h"
+
+#include <sstream>
+
+#include "base/bind.h"
+#include "base/prefs/json_pref_store.h"
+#include "base/prefs/pref_filter.h"
+#include "base/prefs/pref_registry_simple.h"
+#include "base/prefs/pref_service_factory.h"
+#include "base/prefs/scoped_user_pref_update.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
+#include "chrome/common/chrome_constants.h"
+#include "chrome/common/pref_names.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/host_zoom_map.h"
+#include "content/public/common/page_zoom.h"
+
+namespace chrome {
+
+std::string ChromeZoomLevelPrefs::GetHash(const base::FilePath& relative_path) {
+ size_t int_key =
+#if defined(COMPILER_MSVC)
+ BASE_HASH_NAMESPACE::hash_value(relative_path);
+#else
+ BASE_HASH_NAMESPACE::hash<base::FilePath>()(relative_path);
+#endif // COMPILER
+ return base::SizeTToString(int_key);
+}
+
+ChromeZoomLevelPrefs::ChromeZoomLevelPrefs(PrefService* pref_service,
+ const base::FilePath& profile_path)
+ : pref_service_(pref_service),
+ profile_path_(profile_path),
+ host_zoom_map_(nullptr) {
+ DCHECK(pref_service_);
+}
+
+ChromeZoomLevelPrefs::~ChromeZoomLevelPrefs() {
+}
+
+void ChromeZoomLevelPrefs::InitPrefsAndCopyToHostZoomMap(
+ const base::FilePath& partition_path,
+ content::HostZoomMap* host_zoom_map) {
+ DCHECK(!partition_path.empty());
+ DCHECK((partition_path == profile_path_) ||
+ profile_path_.IsParent(partition_path));
+ // This init function must be called only once.
+ DCHECK(!host_zoom_map_);
+ DCHECK(host_zoom_map);
+ host_zoom_map_ = host_zoom_map;
+
+ // Create a partition_key string with no '.'s in it. For the default
+ // StoragePartition, this string will always be "0".
+ base::FilePath partition_relative_path;
+ profile_path_.AppendRelativePath(partition_path, &partition_relative_path);
+ partition_key_ = GetHash(partition_relative_path);
+
+ // Initialize the default zoom level.
+ host_zoom_map_->SetDefaultZoomLevel(GetDefaultZoomLevelPref());
+
+ // Initialize the HostZoomMap with per-host zoom levels from the persisted
+ // zoom-level preference values.
+ const base::DictionaryValue* host_zoom_dictionaries =
+ pref_service_->GetDictionary(prefs::kPartitionPerHostZoomLevels);
+ const base::DictionaryValue* host_zoom_dictionary = nullptr;
+ if (host_zoom_dictionaries->GetDictionary(partition_key_,
+ &host_zoom_dictionary)) {
+ // Since we're calling this before setting up zoom_subscription_ below we
+ // don't need to worry that host_zoom_dictionary is indirectly affected
+ // by calls to HostZoomMap::SetZoomLevelForHost().
+ ExtractPerHostZoomLevels(host_zoom_dictionary);
+ }
+ zoom_subscription_ = host_zoom_map_->AddZoomLevelChangedCallback(base::Bind(
+ &ChromeZoomLevelPrefs::OnZoomLevelChanged, base::Unretained(this)));
+}
+
+void ChromeZoomLevelPrefs::SetDefaultZoomLevelPref(double level) {
+ if (content::ZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel()))
+ return;
+
+ DictionaryPrefUpdate update(pref_service_, prefs::kPartitionDefaultZoomLevel);
+ update->SetDouble(partition_key_, level);
+ // For unregistered paths, OnDefaultZoomLevelChanged won't be called, so
+ // set this manually.
+ host_zoom_map_->SetDefaultZoomLevel(level);
+ default_zoom_changed_callbacks_.Notify();
+}
+
+double ChromeZoomLevelPrefs::GetDefaultZoomLevelPref() const {
+ double default_zoom_level = 0.0;
+
+ const base::DictionaryValue* default_zoom_level_dictionary =
+ pref_service_->GetDictionary(prefs::kPartitionDefaultZoomLevel);
+ // If no default has been previously set, the default returned is the
+ // value used to initialize default_zoom_level in this function.
+ default_zoom_level_dictionary->GetDouble(partition_key_, &default_zoom_level);
+ return default_zoom_level;
+}
+
+scoped_ptr<ChromeZoomLevelPrefs::DefaultZoomLevelSubscription>
+ChromeZoomLevelPrefs::RegisterDefaultZoomLevelCallback(
+ const base::Closure& callback) {
+ return default_zoom_changed_callbacks_.Add(callback);
+}
+
+void ChromeZoomLevelPrefs::OnZoomLevelChanged(
+ const content::HostZoomMap::ZoomLevelChange& change) {
+ if (change.mode != content::HostZoomMap::ZOOM_CHANGED_FOR_HOST)
+ return;
+ double level = change.zoom_level;
+ DictionaryPrefUpdate update(pref_service_,
+ prefs::kPartitionPerHostZoomLevels);
+ base::DictionaryValue* host_zoom_dictionaries = update.Get();
+ DCHECK(host_zoom_dictionaries);
+
+ bool modification_is_removal =
+ content::ZoomValuesEqual(level, host_zoom_map_->GetDefaultZoomLevel());
+
+ base::DictionaryValue* host_zoom_dictionary = nullptr;
+ if (!host_zoom_dictionaries->GetDictionary(partition_key_,
+ &host_zoom_dictionary)) {
+ host_zoom_dictionary = new base::DictionaryValue();
+ host_zoom_dictionaries->Set(partition_key_, host_zoom_dictionary);
+ }
+
+ if (modification_is_removal)
+ host_zoom_dictionary->RemoveWithoutPathExpansion(change.host, nullptr);
+ else
+ host_zoom_dictionary->SetDoubleWithoutPathExpansion(change.host, level);
+}
+
+void ChromeZoomLevelPrefs::ExtractPerHostZoomLevels(
+ const base::DictionaryValue* host_zoom_dictionary) {
+ std::vector<std::string> keys_to_remove;
sky 2014/10/10 19:43:59 Is there a particular reason you build up a vector
wjmaclean 2014/10/10 20:23:02 In the original code (some of this existed in prof
+ scoped_ptr<base::DictionaryValue> host_zoom_dictionary_copy(
+ host_zoom_dictionary->DeepCopyWithoutEmptyChildren());
+ for (base::DictionaryValue::Iterator i(*host_zoom_dictionary_copy);
+ !i.IsAtEnd();
+ i.Advance()) {
+ const std::string& host(i.key());
+ double zoom_level = 0;
+
+ bool has_valid_zoom_level = i.value().GetAsDouble(&zoom_level);
+
+ // Filter out A) the empty host, B) zoom levels equal to the default; and
+ // remember them, so that we can later erase them from Prefs.
+ // Values of type A and B could have been stored due to crbug.com/364399.
+ // Values of type B could further have been stored before the default zoom
+ // level was set to its current value. In either case, SetZoomLevelForHost
+ // will ignore type B values, thus, to have consistency with HostZoomMap's
+ // internal state, these values must also be removed from Prefs.
+ if (host.empty() || !has_valid_zoom_level ||
+ content::ZoomValuesEqual(zoom_level,
+ host_zoom_map_->GetDefaultZoomLevel())) {
+ keys_to_remove.push_back(host);
+ continue;
+ }
+
+ host_zoom_map_->SetZoomLevelForHost(host, zoom_level);
+ }
+
+ // Sanitize prefs to remove entries that match the default zoom level and/or
+ // have an empty host.
+ {
+ DictionaryPrefUpdate update(pref_service_,
+ prefs::kPartitionPerHostZoomLevels);
+ base::DictionaryValue* host_zoom_dictionaries = update.Get();
+ base::DictionaryValue* host_zoom_dictionary = nullptr;
+ host_zoom_dictionaries->GetDictionary(partition_key_,
+ &host_zoom_dictionary);
+ for (const std::string& s : keys_to_remove)
+ host_zoom_dictionary->RemoveWithoutPathExpansion(s, nullptr);
+ }
+}
+
+} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698