chrome/browser/ui/app_list/app_list_service_mac.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/app_list/app_list_service_mac.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/status_icons/status_tray_unittest.cc ('k') | chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_service_mac.mm

diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm

index 45ba47786d63c6e41173270d142711edfb1ed78e..141c8a3a1afc5cf8b90e263217d6946387e4fc1a 100644

--- a/chrome/browser/ui/app_list/app_list_service_mac.mm

+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm

@@ -15,7 +15,6 @@

#include "base/memory/singleton.h"

#include "base/message_loop/message_loop.h"

#include "base/prefs/pref_service.h"

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

#import "chrome/browser/app_controller_mac.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/extensions/extension_service.h"

@@ -39,6 +38,7 @@

#include "content/public/browser/browser_thread.h"

#include "extensions/browser/extension_system.h"

#include "extensions/common/manifest_handlers/file_handler_info.h"

+#include "grit/chrome_unscaled_resources.h"

#include "net/base/url_util.h"

#import "ui/app_list/cocoa/app_list_view_controller.h"

#import "ui/app_list/cocoa/app_list_window_controller.h"