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

Side by Side Diff: ash/wm/overview/window_selector.cc

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 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
« no previous file with comments | « ash/system/tray_accessibility.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/wm/overview/window_selector.h" 5 #include "ash/wm/overview/window_selector.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 text_filter_widget_.reset( 266 text_filter_widget_.reset(
267 CreateTextFilter(this, Shell::GetPrimaryRootWindow())); 267 CreateTextFilter(this, Shell::GetPrimaryRootWindow()));
268 268
269 shell->activation_client()->AddObserver(this); 269 shell->activation_client()->AddObserver(this);
270 270
271 shell->GetScreen()->AddObserver(this); 271 shell->GetScreen()->AddObserver(this);
272 shell->metrics()->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW); 272 shell->metrics()->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW);
273 HideAndTrackNonOverviewWindows(); 273 HideAndTrackNonOverviewWindows();
274 // Send an a11y alert. 274 // Send an a11y alert.
275 shell->accessibility_delegate()->TriggerAccessibilityAlert( 275 shell->accessibility_delegate()->TriggerAccessibilityAlert(
276 A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED); 276 ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED);
277 277
278 UpdateShelfVisibility(); 278 UpdateShelfVisibility();
279 } 279 }
280 280
281 WindowSelector::~WindowSelector() { 281 WindowSelector::~WindowSelector() {
282 ash::Shell* shell = ash::Shell::GetInstance(); 282 ash::Shell* shell = ash::Shell::GetInstance();
283 283
284 ResetFocusRestoreWindow(true); 284 ResetFocusRestoreWindow(true);
285 for (std::set<aura::Window*>::iterator iter = observed_windows_.begin(); 285 for (std::set<aura::Window*>::iterator iter = observed_windows_.begin();
286 iter != observed_windows_.end(); ++iter) { 286 iter != observed_windows_.end(); ++iter) {
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 for (size_t i = 0; 581 for (size_t i = 0;
582 i <= grid_list_.size() && 582 i <= grid_list_.size() &&
583 grid_list_[selected_grid_index_]->Move(direction, animate); i++) { 583 grid_list_[selected_grid_index_]->Move(direction, animate); i++) {
584 // TODO(flackr): If there are more than two monitors, move between grids 584 // TODO(flackr): If there are more than two monitors, move between grids
585 // in the requested direction. 585 // in the requested direction.
586 selected_grid_index_ = (selected_grid_index_ + 1) % grid_list_.size(); 586 selected_grid_index_ = (selected_grid_index_ + 1) % grid_list_.size();
587 } 587 }
588 } 588 }
589 589
590 } // namespace ash 590 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray_accessibility.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698