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

Side by Side Diff: ash/shell.cc

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple
Patch Set: Updated tests Created 4 years, 6 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
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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 void Shell::DismissAppList() { 332 void Shell::DismissAppList() {
333 delegate_->GetAppListPresenter()->Dismiss(); 333 delegate_->GetAppListPresenter()->Dismiss();
334 } 334 }
335 335
336 void Shell::ToggleAppList(aura::Window* window) { 336 void Shell::ToggleAppList(aura::Window* window) {
337 // If the context window is not given, show it on the target root window. 337 // If the context window is not given, show it on the target root window.
338 delegate_->GetAppListPresenter()->ToggleAppList( 338 delegate_->GetAppListPresenter()->ToggleAppList(
339 GetDisplayIdForWindow(window)); 339 GetDisplayIdForWindow(window));
340 } 340 }
341 341
342 bool Shell::IsApplistVisible() const {
343 return delegate_->GetAppListPresenter()->IsVisible();
344 }
345
342 bool Shell::GetAppListTargetVisibility() const { 346 bool Shell::GetAppListTargetVisibility() const {
343 return delegate_->GetAppListPresenter()->GetTargetVisibility(); 347 return delegate_->GetAppListPresenter()->GetTargetVisibility();
344 } 348 }
345 349
346 bool Shell::IsSystemModalWindowOpen() const { 350 bool Shell::IsSystemModalWindowOpen() const {
347 if (simulate_modal_window_open_for_testing_) 351 if (simulate_modal_window_open_for_testing_)
348 return true; 352 return true;
349 const std::vector<aura::Window*> containers = GetContainersFromAllRootWindows( 353 const std::vector<aura::Window*> containers = GetContainersFromAllRootWindows(
350 kShellWindowId_SystemModalContainer, nullptr); 354 kShellWindowId_SystemModalContainer, nullptr);
351 for (std::vector<aura::Window*>::const_iterator cit = containers.begin(); 355 for (std::vector<aura::Window*>::const_iterator cit = containers.begin();
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 1247
1244 void Shell::OnWindowActivated( 1248 void Shell::OnWindowActivated(
1245 aura::client::ActivationChangeObserver::ActivationReason reason, 1249 aura::client::ActivationChangeObserver::ActivationReason reason,
1246 aura::Window* gained_active, 1250 aura::Window* gained_active,
1247 aura::Window* lost_active) { 1251 aura::Window* lost_active) {
1248 if (gained_active) 1252 if (gained_active)
1249 target_root_window_ = gained_active->GetRootWindow(); 1253 target_root_window_ = gained_active->GetRootWindow();
1250 } 1254 }
1251 1255
1252 } // namespace ash 1256 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698