chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.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/website_settings/permission_bubble_controller_unittest.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/website_settings/permission_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/website_settings/split_block_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

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

index c20f0ac2fa3740e5d17a6205a9971b66462c8605..b2eaaabca97de06b04eb375911358d3b99e1956d 100644

--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

@@ -13,11 +13,11 @@

#import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"

#import "chrome/browser/ui/cocoa/website_settings/split_block_button.h"

#include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"

-#include "grit/generated_resources.h"

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

+#include "testing/gmock/include/gmock/gmock.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/l10n/l10n_util_mac.h"

#import "ui/events/test/cocoa_test_event_utils.h"

-#include "testing/gmock/include/gmock/gmock.h"

@class ConstrainedWindowButton;