Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc 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
« no previous file with comments | « chrome/browser/extensions/window_open_apitest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_capture_devices_dispatcher.cc
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
index 1db0f885648aa47237340cd8d58ce54dea3f901d..ffb3aa2976ef2bf61140c7b0da17fa0dc14ab19d 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
@@ -4,8 +4,6 @@
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "base/metrics/field_trial.h"
@@ -40,6 +38,8 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/media_stream_request.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/permissions/permissions_data.h"
@@ -236,10 +236,10 @@ gfx::NativeWindow FindParentWindowForWebContents(
if (browser && browser->window())
return browser->window()->GetNativeWindow();
- const apps::AppWindowRegistry::AppWindowList& window_list =
- apps::AppWindowRegistry::Get(
+ const extensions::AppWindowRegistry::AppWindowList& window_list =
+ extensions::AppWindowRegistry::Get(
web_contents->GetBrowserContext())->app_windows();
- for (apps::AppWindowRegistry::AppWindowList::const_iterator iter =
+ for (extensions::AppWindowRegistry::AppWindowList::const_iterator iter =
window_list.begin();
iter != window_list.end(); ++iter) {
if ((*iter)->web_contents() == web_contents)
« no previous file with comments | « chrome/browser/extensions/window_open_apitest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698