chrome/browser/shell_integration_linux.cc - 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/shell_integration_linux.cc

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/profiles/profile_shortcut_manager_win.cc ('k') | chrome/browser/status_icons/status_icon_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/shell_integration_linux.cc

diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc

index 2b38c3d6447cbd0e4a3f89bdf89777a930f2a9e1..905b23f07ced48adc233d82a5a8190acd653fcec 100644

--- a/chrome/browser/shell_integration_linux.cc

+++ b/chrome/browser/shell_integration_linux.cc

@@ -40,12 +40,12 @@

#include "base/threading/thread.h"

#include "base/threading/thread_restrictions.h"

#include "build/build_config.h"

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

#include "chrome/browser/shell_integration.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

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

+#include "grit/chrome_unscaled_resources.h"

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

#include "ui/gfx/image/image_family.h"

#include "url/gurl.h"