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

Unified Diff: ui/views/corewm/transient_window_manager_unittest.cc

Issue 121773003: Makes Window::Init take a WindowLayerType instead of LayerType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to master Created 6 years, 11 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: ui/views/corewm/transient_window_manager_unittest.cc
diff --git a/ui/views/corewm/transient_window_manager_unittest.cc b/ui/views/corewm/transient_window_manager_unittest.cc
index b942eb1251f49367cb26bc1adb4db4ce23783d38..733cde61f690d3864af70db00c2bfc14b659248f 100644
--- a/ui/views/corewm/transient_window_manager_unittest.cc
+++ b/ui/views/corewm/transient_window_manager_unittest.cc
@@ -31,7 +31,7 @@ class TransientWindowManagerTest : public views::ViewsTestBase {
Window* window = new Window(NULL);
window->set_id(id);
window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
- window->Init(ui::LAYER_TEXTURED);
+ window->Init(aura::WINDOW_LAYER_TEXTURED);
aura::client::ParentWindowWithContext(window, GetContext(), gfx::Rect());
AddTransientChild(parent, window);
return window;
@@ -257,11 +257,11 @@ TEST_F(TransientWindowManagerTest, NotifyDelegateAfterDeletingTransients) {
DestroyedTrackingDelegate parent_delegate("parent", &destruction_order);
scoped_ptr<Window> parent(new Window(&parent_delegate));
- parent->Init(ui::LAYER_NOT_DRAWN);
+ parent->Init(aura::WINDOW_LAYER_NOT_DRAWN);
DestroyedTrackingDelegate transient_delegate("transient", &destruction_order);
Window* transient = new Window(&transient_delegate); // Owned by |parent|.
- transient->Init(ui::LAYER_NOT_DRAWN);
+ transient->Init(aura::WINDOW_LAYER_NOT_DRAWN);
AddTransientChild(parent.get(), transient);
parent.reset();
« no previous file with comments | « ui/views/corewm/shadow_controller_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698