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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell_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
« no previous file with comments | « ash/shell/keyboard_controller_proxy_stub.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 72a4524b87ffa0653c2bb17c7cc30b8c49d5efa6..203a38b0101b0767fcd934eb6f08d2db7a4829d7 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -463,7 +463,7 @@ TEST_F(ShellTest, ToggleAutoHide) {
scoped_ptr<aura::Window> window(new aura::Window(NULL));
window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
- window->Init(ui::LAYER_TEXTURED);
+ window->Init(aura::WINDOW_LAYER_TEXTURED);
ParentWindowInPrimaryRootWindow(window.get());
window->Show();
wm::ActivateWindow(window.get());
@@ -532,7 +532,7 @@ class ShellTest2 : public test::AshTestBase {
TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
window_.reset(new aura::Window(NULL));
- window_->Init(ui::LAYER_NOT_DRAWN);
+ window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
}
} // namespace ash
« no previous file with comments | « ash/shell/keyboard_controller_proxy_stub.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698