chrome/browser/web_applications/web_app_mac.mm - Issue 15239002: Move Extension and PermissionsData to extensions/common.

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 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 40ebc2700465c81ebbb5fca54dec3f386af4df31..da753c2e161c14b2ae580d5cb8ed7fb4c0df6ef7 100644

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

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

@@ -18,9 +18,9 @@

#include "base/mac/scoped_cftyperef.h"

#include "base/path_service.h"

#include "base/process/process_handle.h"

+#include "base/strings/string16.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

-#include "base/strings/string16.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

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

@@ -30,9 +30,9 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

-#include "chrome/common/extensions/extension.h"

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

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

+#include "extensions/common/extension.h"

#include "grit/chromium_strings.h"

#import "skia/ext/skia_utils_mac.h"

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

« no previous file with comments | « chrome/browser/web_applications/web_app.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »