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

Unified Diff: chrome/browser/ui/browser_commands.cc

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
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index b289ec114e1dd77b78f6e1ff53f46c4e65fa069c..64261f153d31c8c5ba91ef8619ab527f0eef205f 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -50,7 +50,6 @@
#include "chrome/browser/ui/status_bubble.h"
#include "chrome/browser/ui/tab_contents/core_tab_helper.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/zoom/zoom_controller.h"
#include "chrome/browser/upgrade_detector.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
@@ -75,6 +74,7 @@
#include "content/public/common/url_constants.h"
#include "content/public/common/url_utils.h"
#include "content/public/common/user_agent.h"
+#include "extensions/browser/ui/zoom/zoom_controller.h"
#include "net/base/escape.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -596,19 +596,22 @@ void CloseTab(Browser* browser) {
}
bool CanZoomIn(content::WebContents* contents) {
- ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
+ extensions::ZoomController* zoom_controller =
+ extensions::ZoomController::FromWebContents(contents);
return zoom_controller->GetZoomPercent() !=
contents->GetMaximumZoomPercent() + 1;
}
bool CanZoomOut(content::WebContents* contents) {
- ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
+ extensions::ZoomController* zoom_controller =
+ extensions::ZoomController::FromWebContents(contents);
return zoom_controller->GetZoomPercent() !=
contents->GetMinimumZoomPercent();
}
bool ActualSize(content::WebContents* contents) {
- ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
+ extensions::ZoomController* zoom_controller =
+ extensions::ZoomController::FromWebContents(contents);
return zoom_controller->GetZoomPercent() != 100.0f;
}

Powered by Google App Engine
This is Rietveld 408576698