chrome/browser/web_applications/web_app_mac.mm - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/web_applications/web_app_mac.mm

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/password_manager/password_manager_util_win.cc ('K') | « chrome/browser/undo/undo_manager.cc ('k') | chrome/browser/webdata/web_data_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/web_applications/web_app_mac.mm

diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm

index a0a3ba05aaf106c7daeaa77556482ed75e995b8c..3817ab6cd91f1a9cb8ace8f84a5b35e5f4e08241 100644

--- a/chrome/browser/web_applications/web_app_mac.mm

+++ b/chrome/browser/web_applications/web_app_mac.mm

@@ -27,8 +27,8 @@

#include "base/strings/utf_string_conversions.h"

#include "base/version.h"

#include "chrome/browser/browser_process.h"

-#import "chrome/browser/mac/dock.h"

#include "chrome/browser/browser_process.h"

+#import "chrome/browser/mac/dock.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/shell_integration.h"

@@ -38,11 +38,11 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#import "chrome/common/mac/app_mode_common.h"

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

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

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

#include "grit/chrome_unscaled_resources.h"

-#include "grit/generated_resources.h"

#import "skia/ext/skia_utils_mac.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "third_party/skia/include/core/SkColor.h"