OLD | NEW |
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/common/wm/workspace/workspace_layout_manager.h" | 5 #include "ash/common/wm/workspace/workspace_layout_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 ////////////////////////////////////////////////////////////////////////////// | 127 ////////////////////////////////////////////////////////////////////////////// |
128 // WorkspaceLayoutManager, keyboard::KeyboardControllerObserver implementation: | 128 // WorkspaceLayoutManager, keyboard::KeyboardControllerObserver implementation: |
129 | 129 |
130 void WorkspaceLayoutManager::OnKeyboardBoundsChanging( | 130 void WorkspaceLayoutManager::OnKeyboardBoundsChanging( |
131 const gfx::Rect& new_bounds) { | 131 const gfx::Rect& new_bounds) { |
132 // If new window behavior flag enabled and in non-sticky mode, do not change | 132 // If new window behavior flag enabled and in non-sticky mode, do not change |
133 // the work area. | 133 // the work area. |
134 bool change_work_area = | 134 bool change_work_area = |
135 (!base::CommandLine::ForCurrentProcess()->HasSwitch( | 135 (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
136 ::switches::kUseNewVirtualKeyboardBehavior) || | 136 ::switches::kUseNewVirtualKeyboardBehavior) || |
137 keyboard::KeyboardController::GetInstance()->get_lock_keyboard()); | 137 keyboard::KeyboardController::GetInstance()->keyboard_locked()); |
138 if (!change_work_area) | 138 if (!change_work_area) |
139 return; | 139 return; |
140 | 140 |
141 WmWindow* window = shell_->GetActiveWindow(); | 141 WmWindow* window = shell_->GetActiveWindow(); |
142 if (!window) | 142 if (!window) |
143 return; | 143 return; |
144 | 144 |
145 window = window->GetToplevelWindow(); | 145 window = window->GetToplevelWindow(); |
146 if (!window_->Contains(window)) | 146 if (!window_->Contains(window)) |
147 return; | 147 return; |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 for (auto* window : windows) { | 377 for (auto* window : windows) { |
378 wm::WindowState* window_state = window->GetWindowState(); | 378 wm::WindowState* window_state = window->GetWindowState(); |
379 if (window_on_top) | 379 if (window_on_top) |
380 window_state->DisableAlwaysOnTop(window_on_top); | 380 window_state->DisableAlwaysOnTop(window_on_top); |
381 else | 381 else |
382 window_state->RestoreAlwaysOnTop(); | 382 window_state->RestoreAlwaysOnTop(); |
383 } | 383 } |
384 } | 384 } |
385 | 385 |
386 } // namespace ash | 386 } // namespace ash |
OLD | NEW |