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

Side by Side Diff: ui/views/corewm/shadow_controller_unittest.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unneeded parens 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/corewm/shadow_controller.cc ('k') | ui/views/corewm/transient_window_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/corewm/shadow_controller.h" 5 #include "ui/views/corewm/shadow_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "ui/aura/client/activation_client.h" 11 #include "ui/aura/client/activation_client.h"
12 #include "ui/aura/client/window_tree_client.h" 12 #include "ui/aura/client/window_tree_client.h"
13 #include "ui/aura/root_window.h" 13 #include "ui/aura/root_window.h"
14 #include "ui/aura/test/aura_test_base.h" 14 #include "ui/aura/test/aura_test_base.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/compositor/layer.h" 16 #include "ui/compositor/layer.h"
17 #include "ui/views/corewm/shadow.h" 17 #include "ui/views/corewm/shadow.h"
18 #include "ui/views/corewm/shadow_types.h" 18 #include "ui/views/corewm/shadow_types.h"
19 #include "ui/views/corewm/window_util.h"
19 #include "ui/views/corewm/wm_state.h" 20 #include "ui/views/corewm/wm_state.h"
20 21
21 namespace views { 22 namespace views {
22 namespace corewm { 23 namespace corewm {
23 24
24 class ShadowControllerTest : public aura::test::AuraTestBase { 25 class ShadowControllerTest : public aura::test::AuraTestBase {
25 public: 26 public:
26 ShadowControllerTest() {} 27 ShadowControllerTest() {}
27 virtual ~ShadowControllerTest() {} 28 virtual ~ShadowControllerTest() {}
28 29
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style()); 199 EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
199 200
200 // Create a window that is transient to window1, and that has the 'hide on 201 // Create a window that is transient to window1, and that has the 'hide on
201 // deactivate' property set. Upon activation, window1 should still have an 202 // deactivate' property set. Upon activation, window1 should still have an
202 // active shadow. 203 // active shadow.
203 scoped_ptr<aura::Window> window2(new aura::Window(NULL)); 204 scoped_ptr<aura::Window> window2(new aura::Window(NULL));
204 window2->SetType(ui::wm::WINDOW_TYPE_NORMAL); 205 window2->SetType(ui::wm::WINDOW_TYPE_NORMAL);
205 window2->Init(ui::LAYER_TEXTURED); 206 window2->Init(ui::LAYER_TEXTURED);
206 ParentWindow(window2.get()); 207 ParentWindow(window2.get());
207 window2->SetBounds(gfx::Rect(11, 21, 301, 401)); 208 window2->SetBounds(gfx::Rect(11, 21, 301, 401));
208 window1->AddTransientChild(window2.get()); 209 AddTransientChild(window1.get(), window2.get());
209 aura::client::SetHideOnDeactivate(window2.get(), true); 210 aura::client::SetHideOnDeactivate(window2.get(), true);
210 window2->Show(); 211 window2->Show();
211 ActivateWindow(window2.get()); 212 ActivateWindow(window2.get());
212 213
213 // window1 is now inactive, but its shadow should still appear active. 214 // window1 is now inactive, but its shadow should still appear active.
214 EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style()); 215 EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
215 } 216 }
216 217
217 } // namespace corewm 218 } // namespace corewm
218 } // namespace views 219 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/corewm/shadow_controller.cc ('k') | ui/views/corewm/transient_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698