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

Side by Side Diff: ash/common/system/tray_accessibility.cc

Issue 2162153002: Added Ash.SystemMenu.DefaultView.VisibleItems histogram. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed the COUNT value from the SystemMenuDefaultViewRows enum. 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/common/system/tray_accessibility.h" 5 #include "ash/common/system/tray_accessibility.h"
6 6
7 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
8 #include "ash/common/accessibility_types.h" 8 #include "ash/common/accessibility_types.h"
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 else if (sender == settings_view_) 296 else if (sender == settings_view_)
297 tray_delegate->ShowAccessibilitySettings(); 297 tray_delegate->ShowAccessibilitySettings();
298 } 298 }
299 299
300 } // namespace tray 300 } // namespace tray
301 301
302 //////////////////////////////////////////////////////////////////////////////// 302 ////////////////////////////////////////////////////////////////////////////////
303 // ash::TrayAccessibility 303 // ash::TrayAccessibility
304 304
305 TrayAccessibility::TrayAccessibility(SystemTray* system_tray) 305 TrayAccessibility::TrayAccessibility(SystemTray* system_tray)
306 : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_ACCESSIBILITY), 306 : TrayImageItem(system_tray,
307 IDR_AURA_UBER_TRAY_ACCESSIBILITY,
308 UMA_ACCESSIBILITY),
307 default_(NULL), 309 default_(NULL),
308 detailed_popup_(NULL), 310 detailed_popup_(NULL),
309 detailed_menu_(NULL), 311 detailed_menu_(NULL),
310 request_popup_view_state_(A11Y_NONE), 312 request_popup_view_state_(A11Y_NONE),
311 tray_icon_visible_(false), 313 tray_icon_visible_(false),
312 login_(GetCurrentLoginStatus()), 314 login_(GetCurrentLoginStatus()),
313 previous_accessibility_state_(GetAccessibilityState()), 315 previous_accessibility_state_(GetAccessibilityState()),
314 show_a11y_menu_on_lock_screen_(true) { 316 show_a11y_menu_on_lock_screen_(true) {
315 DCHECK(system_tray); 317 DCHECK(system_tray);
316 WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this); 318 WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 if (detailed_popup_) 419 if (detailed_popup_)
418 detailed_popup_->GetWidget()->Close(); 420 detailed_popup_->GetWidget()->Close();
419 if (detailed_menu_) 421 if (detailed_menu_)
420 detailed_menu_->GetWidget()->Close(); 422 detailed_menu_->GetWidget()->Close();
421 } 423 }
422 424
423 previous_accessibility_state_ = accessibility_state; 425 previous_accessibility_state_ = accessibility_state;
424 } 426 }
425 427
426 } // namespace ash 428 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_popup_item_container.cc ('k') | ash/common/system/update/tray_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698