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

Unified Diff: chrome/browser/ui/views/location_bar/zoom_view.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/ui/views/location_bar/zoom_view.h ('k') | chrome/browser/ui/views/toolbar/app_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/zoom_view.cc
diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc
index 6ec35251de29da85dbbceb60d062fc4b1cd67a2f..562dcc703440c200f9f4f22318d3d227312b981f 100644
--- a/chrome/browser/ui/views/location_bar/zoom_view.cc
+++ b/chrome/browser/ui/views/location_bar/zoom_view.cc
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
#include "chrome/grit/generated_resources.h"
#include "components/toolbar/toolbar_model.h"
-#include "components/ui/zoom/zoom_controller.h"
+#include "components/zoom/zoom_controller.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/events/event.h"
@@ -26,7 +26,7 @@ ZoomView::ZoomView(LocationBarView::Delegate* location_bar_delegate)
ZoomView::~ZoomView() {
}
-void ZoomView::Update(ui_zoom::ZoomController* zoom_controller) {
+void ZoomView::Update(zoom::ZoomController* zoom_controller) {
if (!zoom_controller || zoom_controller->IsAtDefaultZoom() ||
location_bar_delegate_->GetToolbarModel()->input_in_progress()) {
SetVisible(false);
@@ -40,7 +40,7 @@ void ZoomView::Update(ui_zoom::ZoomController* zoom_controller) {
// The icon is hidden when the zoom level is default.
image_id_ = zoom_controller->GetZoomRelativeToDefault() ==
- ui_zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM
+ zoom::ZoomController::ZOOM_BELOW_DEFAULT_ZOOM
? gfx::VectorIconId::ZOOM_MINUS
: gfx::VectorIconId::ZOOM_PLUS;
if (GetNativeTheme())
« no previous file with comments | « chrome/browser/ui/views/location_bar/zoom_view.h ('k') | chrome/browser/ui/views/toolbar/app_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698