chrome/browser/mac/install_from_dmg.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/mac/install_from_dmg.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: rebase 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

Index: chrome/browser/mac/install_from_dmg.mm

diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm

index dfe2a36c36f8832445fb21076a1c5584f303feda..7f85592ae60a1531d116345ecbb86d88b5f561a2 100644

--- a/chrome/browser/mac/install_from_dmg.mm

+++ b/chrome/browser/mac/install_from_dmg.mm

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

#include <signal.h>

#include <stdlib.h>

#include <string.h>

-#include <sys/param.h>

#include <sys/mount.h>

+#include <sys/param.h>

#include "base/auto_reset.h"

#include "base/basictypes.h"

@@ -24,8 +24,8 @@

#include "base/mac/authorization_util.h"

#include "base/mac/bundle_locations.h"

#include "base/mac/mac_logging.h"

-#include "base/mac/mach_logging.h"

#import "base/mac/mac_util.h"

+#include "base/mac/mach_logging.h"

#include "base/mac/scoped_authorizationref.h"

#include "base/mac/scoped_cftyperef.h"

#include "base/mac/scoped_ioobject.h"

@@ -36,8 +36,8 @@

#import "chrome/browser/mac/keystone_glue.h"

#include "chrome/browser/mac/relauncher.h"

#include "chrome/common/chrome_constants.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

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

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

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

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

« no previous file with comments | « chrome/browser/local_discovery/privet_notifications.cc ('k') | chrome/browser/mac/keystone_glue.mm » ('j') | no next file with comments »