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

Unified Diff: chrome/browser/chromeos/login/test/app_window_waiter.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/login/test/app_window_waiter.cc
diff --git a/chrome/browser/chromeos/login/test/app_window_waiter.cc b/chrome/browser/chromeos/login/test/app_window_waiter.cc
index f9be212488b5d241543b8ec4bbeda8f039b37ac6..75a339708dbf2aff682038809c4f14e75006e622 100644
--- a/chrome/browser/chromeos/login/test/app_window_waiter.cc
+++ b/chrome/browser/chromeos/login/test/app_window_waiter.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/chromeos/login/test/app_window_waiter.h"
-#include "apps/app_window.h"
+#include "extensions/browser/app_window/app_window.h"
namespace chromeos {
-AppWindowWaiter::AppWindowWaiter(apps::AppWindowRegistry* registry,
+AppWindowWaiter::AppWindowWaiter(extensions::AppWindowRegistry* registry,
const std::string& app_id)
: registry_(registry), app_id_(app_id), window_(NULL) {
registry_->AddObserver(this);
@@ -18,7 +18,7 @@ AppWindowWaiter::~AppWindowWaiter() {
registry_->RemoveObserver(this);
}
-apps::AppWindow* AppWindowWaiter::Wait() {
+extensions::AppWindow* AppWindowWaiter::Wait() {
window_ = registry_->GetCurrentAppWindowForApp(app_id_);
if (window_)
return window_;
@@ -28,7 +28,7 @@ apps::AppWindow* AppWindowWaiter::Wait() {
return window_;
}
-void AppWindowWaiter::OnAppWindowAdded(apps::AppWindow* app_window) {
+void AppWindowWaiter::OnAppWindowAdded(extensions::AppWindow* app_window) {
if (!run_loop_.running())
return;

Powered by Google App Engine
This is Rietveld 408576698