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

Side by Side Diff: ash/display/display_controller.cc

Issue 47873003: Add a full screen virtual keyboard to virtual keyboard root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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/display/display_controller.h" 5 #include "ash/display/display_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <map> 9 #include <map>
10 10
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 internal::GetRootWindowController(root_window); 332 internal::GetRootWindowController(root_window);
333 if (controller) { 333 if (controller) {
334 controller->CloseChildWindows(); 334 controller->CloseChildWindows();
335 } else { 335 } else {
336 while (!root_window->children().empty()) { 336 while (!root_window->children().empty()) {
337 aura::Window* child = root_window->children()[0]; 337 aura::Window* child = root_window->children()[0];
338 delete child; 338 delete child;
339 } 339 }
340 } 340 }
341 } 341 }
342 if (virtual_keyboard_window_controller_ &&
343 virtual_keyboard_window_controller_->root_window_controller()) {
344 virtual_keyboard_window_controller_->root_window_controller()->
345 CloseChildWindows();
346 }
oshima 2013/11/01 00:09:02 can you call CloseNonDesktopDisplay() at the en
bshe 2013/11/12 15:28:33 This close child window currently depends on event
oshima 2013/11/13 21:22:49 Let me look into this dependency.
oshima 2013/11/13 22:23:37 What kind of problem you have seen? I just tried a
bshe 2013/11/14 00:11:29 Talked on hangout. I misunderstood you, sorry. Cha
342 } 347 }
343 348
344 std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() { 349 std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() {
345 std::vector<aura::RootWindow*> windows; 350 std::vector<aura::RootWindow*> windows;
346 for (std::map<int64, aura::RootWindow*>::const_iterator it = 351 for (std::map<int64, aura::RootWindow*>::const_iterator it =
347 root_windows_.begin(); it != root_windows_.end(); ++it) { 352 root_windows_.begin(); it != root_windows_.end(); ++it) {
348 DCHECK(it->second); 353 DCHECK(it->second);
349 if (internal::GetRootWindowController(it->second)) 354 if (internal::GetRootWindowController(it->second))
350 windows.push_back(it->second); 355 windows.push_back(it->second);
351 } 356 }
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 std::string name = 800 std::string name =
796 root_windows[i] == primary ? "aura_root_0" : "aura_root_x"; 801 root_windows[i] == primary ? "aura_root_0" : "aura_root_x";
797 gfx::AcceleratedWidget xwindow = 802 gfx::AcceleratedWidget xwindow =
798 root_windows[i]->GetDispatcher()->GetAcceleratedWidget(); 803 root_windows[i]->GetDispatcher()->GetAcceleratedWidget();
799 XStoreName(gfx::GetXDisplay(), xwindow, name.c_str()); 804 XStoreName(gfx::GetXDisplay(), xwindow, name.c_str());
800 } 805 }
801 #endif 806 #endif
802 } 807 }
803 808
804 } // namespace ash 809 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698