chrome/browser/ui/browser.h - 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/ui/browser.h

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

Patch Set: Mac build fix #4. 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/ui/autofill/chrome_autofill_client.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.h

diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h

index d71fb796ed7ae55551e7bd540e73105dc445ae2c..4b009a4201bd429564a5b6ca4c9aa095d7a00075 100644

--- a/chrome/browser/ui/browser.h

+++ b/chrome/browser/ui/browser.h

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

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

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

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

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

#include "components/content_settings/core/common/content_settings.h"

#include "components/content_settings/core/common/content_settings_types.h"

#include "components/sessions/session_id.h"

@@ -39,6 +38,7 @@

#include "content/public/browser/page_navigator.h"

#include "content/public/browser/web_contents_delegate.h"

#include "content/public/common/page_zoom.h"

+#include "extensions/browser/ui/zoom/zoom_observer.h"

#include "ui/base/page_transition_types.h"

#include "ui/base/ui_base_types.h"

#include "ui/base/window_open_disposition.h"

@@ -108,7 +108,7 @@ class Browser : public TabStripModelObserver,

public SearchTabHelperDelegate,

public ChromeWebModalDialogManagerDelegate,

public BookmarkTabHelperDelegate,

- public ZoomObserver,

+ public extensions::ZoomObserver,

public content::PageNavigator,

public content::NotificationObserver,

#if defined(ENABLE_EXTENSIONS)

@@ -683,7 +683,8 @@ class Browser : public TabStripModelObserver,

bool starred) override;

// Overridden from ZoomObserver:

- void OnZoomChanged(const ZoomController::ZoomChangedEventData& data) override;

+ void OnZoomChanged(

+ const extensions::ZoomController::ZoomChangedEventData& data) override;

// Overridden from SelectFileDialog::Listener:

void FileSelected(const base::FilePath& path,

« no previous file with comments | « chrome/browser/ui/autofill/chrome_autofill_client.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/views/location_bar/zoom_view.cc » ('J')