chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm - Issue 533013002: Revert of Convert chrome_unscaled_resources to use a qualified path.

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/status_icons/status_icon_mac_unittest.mm

Issue 533013002: Revert of Convert chrome_unscaled_resources to use a qualified path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/apps/quit_with_apps_controller_mac.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm

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

index c760372edb260328869024cc75da9e472b6146a6..3c379ee26a2ffe03e5370f29e0e82ba1a06fae61 100644

--- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm

+++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac_unittest.mm

@@ -5,10 +5,10 @@

#include "base/strings/string_util.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

-#include "chrome/app/theme/grit/chrome_unscaled_resources.h"

#include "chrome/browser/status_icons/status_icon_menu_model.h"

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

#include "chrome/browser/ui/cocoa/status_icons/status_icon_mac.h"

+#include "grit/chrome_unscaled_resources.h"

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

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

#include "ui/base/resource/resource_bundle.h"

« no previous file with comments | « chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »