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

Unified Diff: chrome/browser/automation/testing_automation_provider_aura.cc

Issue 10020048: Work on USE_ASH/USE_AURA split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 8 years, 8 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 | « ash/wm/custom_frame_view_ash.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider_aura.cc
diff --git a/chrome/browser/automation/testing_automation_provider_aura.cc b/chrome/browser/automation/testing_automation_provider_aura.cc
index a1a26da808f95b99ce06392b1bdfbbe0b5d51268..04a8b8c2bfe57d8565e6c938881008cb4d61635b 100644
--- a/chrome/browser/automation/testing_automation_provider_aura.cc
+++ b/chrome/browser/automation/testing_automation_provider_aura.cc
@@ -4,18 +4,25 @@
#include "chrome/browser/automation/testing_automation_provider.h"
-#include "ash/wm/window_util.h"
#include "base/logging.h"
#include "chrome/browser/automation/automation_window_tracker.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/base/ui_base_types.h"
+#if defined(USE_ASH)
+#include "ash/wm/window_util.h"
+#endif
+
void TestingAutomationProvider::ActivateWindow(int handle) {
+#if defined(USE_ASH)
aura::Window* window = window_tracker_->GetResource(handle);
if (window) {
ash::wm::ActivateWindow(window);
}
+#else
+ NOTIMPLEMENTED();
+#endif
}
void TestingAutomationProvider::IsWindowMaximized(int handle,
« no previous file with comments | « ash/wm/custom_frame_view_ash.h ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698