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

Side by Side Diff: ash/root_window_controller_unittest.cc

Issue 62833010: Reland "Add a full screen virtual keyboard to virtual keyboard root window" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: format nit. The main change is patchset 2 Created 7 years, 1 month 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 | « ash/root_window_controller.cc ('k') | ash/shell.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 "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include "ash/session_state_delegate.h" 7 #include "ash/session_state_delegate.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 // GetWindowContainer(). 689 // GetWindowContainer().
690 TEST_F(VirtualKeyboardRootWindowControllerTest, 690 TEST_F(VirtualKeyboardRootWindowControllerTest,
691 DeleteOldContainerOnVirtualKeyboardInit) { 691 DeleteOldContainerOnVirtualKeyboardInit) {
692 aura::Window* root_window = ash::Shell::GetPrimaryRootWindow(); 692 aura::Window* root_window = ash::Shell::GetPrimaryRootWindow();
693 aura::Window* keyboard_container = Shell::GetContainer(root_window, 693 aura::Window* keyboard_container = Shell::GetContainer(root_window,
694 internal::kShellWindowId_VirtualKeyboardContainer); 694 internal::kShellWindowId_VirtualKeyboardContainer);
695 ASSERT_TRUE(keyboard_container); 695 ASSERT_TRUE(keyboard_container);
696 // Track the keyboard container window. 696 // Track the keyboard container window.
697 aura::WindowTracker tracker; 697 aura::WindowTracker tracker;
698 tracker.Add(keyboard_container); 698 tracker.Add(keyboard_container);
699 // Mock a login state change to reinitialize the keyboard. 699 // Mock a login user profile change to reinitialize the keyboard.
700 ash::Shell::GetInstance()->OnLoginStateChanged(user::LOGGED_IN_OWNER); 700 ash::Shell::GetInstance()->OnLoginUserProfilePrepared();
701 // keyboard_container should no longer be present. 701 // keyboard_container should no longer be present.
702 EXPECT_FALSE(tracker.Contains(keyboard_container)); 702 EXPECT_FALSE(tracker.Contains(keyboard_container));
703 } 703 }
704 704
705 } // namespace test 705 } // namespace test
706 } // namespace ash 706 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698