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

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: Changed SetHasInkDrop to SetInkDropMode Created 4 years, 5 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 void Shell::DismissAppList() { 328 void Shell::DismissAppList() {
329 delegate_->GetAppListPresenter()->Dismiss(); 329 delegate_->GetAppListPresenter()->Dismiss();
330 } 330 }
331 331
332 void Shell::ToggleAppList(aura::Window* window) { 332 void Shell::ToggleAppList(aura::Window* window) {
333 // If the context window is not given, show it on the target root window. 333 // If the context window is not given, show it on the target root window.
334 delegate_->GetAppListPresenter()->ToggleAppList( 334 delegate_->GetAppListPresenter()->ToggleAppList(
335 GetDisplayIdForWindow(window)); 335 GetDisplayIdForWindow(window));
336 } 336 }
337 337
338 bool Shell::IsApplistVisible() const {
339 return delegate_->GetAppListPresenter()->IsVisible();
340 }
341
338 bool Shell::GetAppListTargetVisibility() const { 342 bool Shell::GetAppListTargetVisibility() const {
339 return delegate_->GetAppListPresenter()->GetTargetVisibility(); 343 return delegate_->GetAppListPresenter()->GetTargetVisibility();
340 } 344 }
341 345
342 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView( 346 views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
343 views::Widget* widget) { 347 views::Widget* widget) {
344 // Use translucent-style window frames for dialogs. 348 // Use translucent-style window frames for dialogs.
345 return new CustomFrameViewAsh(widget); 349 return new CustomFrameViewAsh(widget);
346 } 350 }
347 351
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 1187
1184 void Shell::OnWindowActivated( 1188 void Shell::OnWindowActivated(
1185 aura::client::ActivationChangeObserver::ActivationReason reason, 1189 aura::client::ActivationChangeObserver::ActivationReason reason,
1186 aura::Window* gained_active, 1190 aura::Window* gained_active,
1187 aura::Window* lost_active) { 1191 aura::Window* lost_active) {
1188 if (gained_active) 1192 if (gained_active)
1189 target_root_window_ = gained_active->GetRootWindow(); 1193 target_root_window_ = gained_active->GetRootWindow();
1190 } 1194 }
1191 1195
1192 } // namespace ash 1196 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698