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

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

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
Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
index dd4cea86131c3379c86783fdb7f958c2d9b9f584..19eff4a1e019a2222d99a2200616ca4af92291b5 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
@@ -24,8 +24,8 @@
#import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h"
#include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
#include "chrome/browser/ui/toolbar/wrench_menu_model.h"
-#include "chrome/browser/ui/zoom/zoom_event_manager.h"
#include "chrome/grit/generated_resources.h"
+#include "components/ui/zoom/zoom_event_manager.h"
#include "content/public/browser/user_metrics.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/models/menu_model.h"
@@ -68,7 +68,7 @@ class AcceleratorDelegate : public ui::AcceleratorProvider {
class ZoomLevelObserver {
public:
ZoomLevelObserver(WrenchMenuController* controller,
- ZoomEventManager* manager)
+ ui_zoom::ZoomEventManager* manager)
: controller_(controller) {
subscription_ = manager->AddZoomLevelChangedCallback(
base::Bind(&ZoomLevelObserver::OnZoomLevelChanged,
@@ -102,7 +102,7 @@ class ZoomLevelObserver {
browser_ = browser;
observer_.reset(new WrenchMenuControllerInternal::ZoomLevelObserver(
self,
- ZoomEventManager::GetForBrowserContext(browser->profile())));
+ ui_zoom::ZoomEventManager::GetForBrowserContext(browser->profile())));
acceleratorDelegate_.reset(
new WrenchMenuControllerInternal::AcceleratorDelegate());
[self createModel];
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm ('k') | chrome/browser/ui/panels/panel_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698