chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_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/content_settings/content_setting_bubble_cocoa_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: nit 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

« chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('K') | « chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm ('k') | chrome/browser/ui/cocoa/content_settings/cookie_details.mm » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

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

index a5d3161748c0e9ef7e8b63ed9d1570ef7bbefa5a..9a2180ac633178f18657aff1e10b52ed452cf177 100644

--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

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

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

#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

#include "chrome/common/chrome_content_client.h"

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

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "chrome/test/base/chrome_unit_test_suite.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile.h"

#include "components/content_settings/core/common/content_settings_types.h"

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

-#include "grit/generated_resources.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "testing/gtest_mac.h"

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