chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/browser/password_generation_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('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 1e853b7038e0b9478830fda028e965f92d60af1e..7cc9b048ea289fb4cd4a8b69264b2ffca9df2ecd 100644

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

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

@@ -7,11 +7,11 @@

#include "base/mac/foundation_util.h"

#include "base/strings/string_number_conversions.h"

#include "chrome/browser/chrome_page_zoom.h"

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

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

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

#include "chrome/browser/ui/zoom/zoom_controller.h"

+#include "chrome/grit/generated_resources.h"

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

-#include "grit/generated_resources.h"

#include "skia/ext/skia_utils_mac.h"

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

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