chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm - Issue 2019423005: Move //components/ui/zoom to top-level under //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/cocoa/browser/zoom_bubble_controller.mm

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/cocoa/app_menu/app_menu_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

index 4de2662991f0f53369b36d95081c93fb1d219d80..efc99a8993c34fa14752aa8022d7409ecabe0754 100644

--- a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm

@@ -11,8 +11,8 @@

#import "chrome/browser/ui/cocoa/info_bubble_view.h"

#import "chrome/browser/ui/cocoa/info_bubble_window.h"

#include "chrome/grit/generated_resources.h"

-#include "components/ui/zoom/page_zoom.h"

-#include "components/ui/zoom/zoom_controller.h"

+#include "components/zoom/page_zoom.h"

+#include "components/zoom/zoom_controller.h"

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

#include "skia/ext/skia_utils_mac.h"

#import "ui/base/cocoa/hover_button.h"

@@ -143,8 +143,8 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

if (!contents)

return;

- ui_zoom::ZoomController* zoomController =

- ui_zoom::ZoomController::FromWebContents(contents);

+ zoom::ZoomController* zoomController =

+ zoom::ZoomController::FromWebContents(contents);

if (!zoomController)

return;

@@ -325,7 +325,7 @@ void SetZoomBubbleAutoCloseDelayForTesting(NSTimeInterval time_interval) {

// there haven't been associated crashes in the wild, so it seems

// fine in practice. It might make sense to close the bubble in

// that case, though.

- ui_zoom::PageZoom::Zoom(webContents, alterPageZoom);

+ zoom::PageZoom::Zoom(webContents, alterPageZoom);

}

@end