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

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

Issue 2330403002: Do not activate system tray bubble by default (Closed)
Patch Set: Do not activate system tray bubble Created 4 years, 3 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 } 284 }
285 } 285 }
286 286
287 void AccessibilityDetailedView::HandleButtonPressed(views::Button* sender, 287 void AccessibilityDetailedView::HandleButtonPressed(views::Button* sender,
288 const ui::Event& event) { 288 const ui::Event& event) {
289 SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate(); 289 SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
290 if (sender == help_view_) 290 if (sender == help_view_)
291 tray_delegate->ShowAccessibilityHelp(); 291 tray_delegate->ShowAccessibilityHelp();
292 else if (sender == settings_view_) 292 else if (sender == settings_view_)
293 tray_delegate->ShowAccessibilitySettings(); 293 tray_delegate->ShowAccessibilitySettings();
294 else
295 return;
296 owner()->system_tray()->CloseSystemBubble();
294 } 297 }
295 298
296 } // namespace tray 299 } // namespace tray
297 300
298 //////////////////////////////////////////////////////////////////////////////// 301 ////////////////////////////////////////////////////////////////////////////////
299 // ash::TrayAccessibility 302 // ash::TrayAccessibility
300 303
301 TrayAccessibility::TrayAccessibility(SystemTray* system_tray) 304 TrayAccessibility::TrayAccessibility(SystemTray* system_tray)
302 : TrayImageItem(system_tray, 305 : TrayImageItem(system_tray,
303 IDR_AURA_UBER_TRAY_ACCESSIBILITY, 306 IDR_AURA_UBER_TRAY_ACCESSIBILITY,
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 if (detailed_popup_) 418 if (detailed_popup_)
416 detailed_popup_->GetWidget()->Close(); 419 detailed_popup_->GetWidget()->Close();
417 if (detailed_menu_) 420 if (detailed_menu_)
418 detailed_menu_->GetWidget()->Close(); 421 detailed_menu_->GetWidget()->Close();
419 } 422 }
420 423
421 previous_accessibility_state_ = accessibility_state; 424 previous_accessibility_state_ = accessibility_state;
422 } 425 }
423 426
424 } // namespace ash 427 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698