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

Unified Diff: ui/aura_shell/activation_controller_unittest.cc

Issue 8968022: Shell related switches -> aura shell switches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | « ui/aura_shell/activation_controller.cc ('k') | ui/aura_shell/always_on_top_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/activation_controller_unittest.cc
===================================================================
--- ui/aura_shell/activation_controller_unittest.cc (revision 114849)
+++ ui/aura_shell/activation_controller_unittest.cc (working copy)
@@ -4,7 +4,6 @@
#include "ui/aura_shell/activation_controller.h"
-#include "ui/aura/client/aura_constants.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/event_generator.h"
@@ -139,7 +138,7 @@
// Creates a menu that covers the transient parent.
scoped_ptr<aura::Window> menu(aura::test::CreateTestWindowWithDelegateAndType(
- &wd, aura::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100), NULL));
+ &wd, aura::client::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100), NULL));
ad2.SetWindow(menu.get());
w1->AddTransientChild(menu.get());
« no previous file with comments | « ui/aura_shell/activation_controller.cc ('k') | ui/aura_shell/always_on_top_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698