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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 2019423005: Move //components/ui/zoom to top-level under //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « chrome/browser/profiles/host_zoom_map_browsertest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 6900541033eaa07424972f193c5d2cee7eb90ff0..d0193125dd566e63df9c7747c2371903f5d18401 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -47,8 +47,8 @@
#include "components/prefs/json_pref_store.h"
#include "components/proxy_config/pref_proxy_config_tracker.h"
#include "components/syncable_prefs/pref_service_syncable.h"
-#include "components/ui/zoom/zoom_event_manager.h"
#include "components/user_prefs/user_prefs.h"
+#include "components/zoom/zoom_event_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/host_zoom_map.h"
#include "content/public/browser/render_process_host.h"
@@ -244,7 +244,7 @@ std::unique_ptr<content::ZoomLevelDelegate>
OffTheRecordProfileImpl::CreateZoomLevelDelegate(
const base::FilePath& partition_path) {
return base::WrapUnique(new ChromeZoomLevelOTRDelegate(
- ui_zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
+ zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
}
scoped_refptr<base::SequencedTaskRunner>
@@ -541,7 +541,7 @@ void OffTheRecordProfileImpl::UpdateDefaultZoomLevel() {
host_zoom_map->SetDefaultZoomLevel(default_zoom_level);
// HostZoomMap does not trigger zoom notification events when the default
// zoom level is set, so we need to do it here.
- ui_zoom::ZoomEventManager::GetForBrowserContext(this)
+ zoom::ZoomEventManager::GetForBrowserContext(this)
->OnDefaultZoomLevelChanged();
}
« no previous file with comments | « chrome/browser/profiles/host_zoom_map_browsertest.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698