chrome/browser/extensions/api/media_galleries/media_galleries_api.cc - Issue 16702003: Move ShellWindow into apps component.

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/extensions/api/media_galleries/media_galleries_api.cc

Issue 16702003: Move ShellWindow into apps component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Self review Created 7 years, 6 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

« apps/shell_window.cc ('K') | « chrome/browser/extensions/api/identity/web_auth_flow.cc ('k') | chrome/browser/extensions/api/tabs/ash_panel_contents.h » ('j') | chrome/browser/extensions/shell_window_registry.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

index 4fbc75bfd14536d0c7844391e9e4991a8bb5dcd0..beff486a63d04c9777d0f5df60c1a5e62ec174eb 100644

--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

@@ -10,6 +10,7 @@

#include <string>

#include <vector>

+#include "apps/shell_window.h"

#include "base/memory/scoped_ptr.h"

#include "base/platform_file.h"

#include "base/stl_util.h"

@@ -21,7 +22,6 @@

#include "chrome/browser/media_galleries/media_galleries_dialog_controller.h"

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

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

-#include "chrome/browser/ui/extensions/shell_window.h"

#include "chrome/common/extensions/api/experimental_media_galleries.h"

#include "chrome/common/extensions/api/media_galleries.h"

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

@@ -39,6 +39,7 @@

#include "base/strings/sys_string_conversions.h"

#endif

+using apps::ShellWindow;

using chrome::MediaFileSystemInfo;

using chrome::MediaFileSystemRegistry;

using chrome::MediaFileSystemsCallback;