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

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.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
Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index d1051d39ea9f60528417c93098189923c25487af..7ccd60b9c69df2aa6590e8cfd69fa9b09f6b751a 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -11,8 +11,6 @@
#include <deque>
#include <string>
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -44,6 +42,8 @@
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
#include "extensions/browser/api/test/test_api.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
#include "extensions/browser/notification_types.h"
#include "extensions/common/extension.h"
#include "google_apis/drive/drive_api_parser.h"
@@ -1158,12 +1158,12 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
} else if (name == "getWindowOwnerId") {
chrome::MultiUserWindowManager* const window_manager =
chrome::MultiUserWindowManager::GetInstance();
- apps::AppWindowRegistry* const app_window_registry =
- apps::AppWindowRegistry::Get(profile());
+ extensions::AppWindowRegistry* const app_window_registry =
+ extensions::AppWindowRegistry::Get(profile());
DCHECK(window_manager);
DCHECK(app_window_registry);
- const apps::AppWindowRegistry::AppWindowList& list =
+ const extensions::AppWindowRegistry::AppWindowList& list =
app_window_registry->GetAppWindowsForApp(
file_manager::kFileManagerAppId);
return list.size() == 1u ?

Powered by Google App Engine
This is Rietveld 408576698