chrome/browser/profiles/host_zoom_map_browsertest.cc - Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove obsolete defines in build files. Created 6 years 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/guest_view/web_view/chrome_web_view_guest_delegate.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/host_zoom_map_browsertest.cc

diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc

index e73524e720abbc444cc10e6dd1e192f17f4c5e65..738d8f542dfbf96d17db988c10da8606da5507c4 100644

--- a/chrome/browser/profiles/host_zoom_map_browsertest.cc

+++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc

@@ -23,7 +23,6 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"

-#include "chrome/browser/ui/zoom/zoom_event_manager.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/pref_names.h"

@@ -31,6 +30,7 @@

#include "chrome/test/base/in_process_browser_test.h"

#include "chrome/test/base/testing_profile.h"

#include "chrome/test/base/ui_test_utils.h"

+#include "components/ui/zoom/zoom_event_manager.h"

#include "content/public/test/test_utils.h"

#include "net/dns/mock_host_resolver.h"

#include "net/test/embedded_test_server/embedded_test_server.h"

@@ -46,7 +46,7 @@ class ZoomLevelChangeObserver {

public:

explicit ZoomLevelChangeObserver(content::BrowserContext* context)

: message_loop_runner_(new content::MessageLoopRunner) {

- subscription_ = ZoomEventManager::GetForBrowserContext(context)

+ subscription_ = ui_zoom::ZoomEventManager::GetForBrowserContext(context)

->AddZoomLevelChangedCallback(base::Bind(

&ZoomLevelChangeObserver::OnZoomLevelChanged,

base::Unretained(this)));