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

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/media_galleries/media_file_system_registry_unittest.cc ('k') | chrome/browser/media_galleries/media_galleries_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/media_galleries_dialog_controller.cc

diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc

index b40907892579ce3487b180970a0272abacf49092..af69c38ece22e68744a165d663ecdfa9280e1cc9 100644

--- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc

+++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc

@@ -17,11 +17,11 @@

#include "chrome/browser/storage_monitor/storage_info.h"

#include "chrome/browser/storage_monitor/storage_monitor.h"

#include "chrome/browser/ui/chrome_select_file_policy.h"

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

#include "chrome/common/extensions/permissions/media_galleries_permission.h"

-#include "chrome/common/extensions/permissions/permissions_data.h"

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

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

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

+#include "extensions/common/permissions/permissions_data.h"

#include "grit/generated_resources.h"

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

#include "ui/base/models/simple_menu_model.h"