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

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 by default 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
« no previous file with comments | « ash/common/system/tray/tray_item_more.cc ('k') | ash/common/system/update/tray_update.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 (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 } 296 }
297 } 297 }
298 298
299 void AccessibilityDetailedView::HandleButtonPressed(views::Button* sender, 299 void AccessibilityDetailedView::HandleButtonPressed(views::Button* sender,
300 const ui::Event& event) { 300 const ui::Event& event) {
301 SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate(); 301 SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
302 if (sender == help_view_) 302 if (sender == help_view_)
303 tray_delegate->ShowAccessibilityHelp(); 303 tray_delegate->ShowAccessibilityHelp();
304 else if (sender == settings_view_) 304 else if (sender == settings_view_)
305 tray_delegate->ShowAccessibilitySettings(); 305 tray_delegate->ShowAccessibilitySettings();
306 else
307 return;
308 owner()->system_tray()->CloseSystemBubble();
306 } 309 }
307 310
308 } // namespace tray 311 } // namespace tray
309 312
310 //////////////////////////////////////////////////////////////////////////////// 313 ////////////////////////////////////////////////////////////////////////////////
311 // ash::TrayAccessibility 314 // ash::TrayAccessibility
312 315
313 TrayAccessibility::TrayAccessibility(SystemTray* system_tray) 316 TrayAccessibility::TrayAccessibility(SystemTray* system_tray)
314 : TrayImageItem(system_tray, 317 : TrayImageItem(system_tray,
315 IDR_AURA_UBER_TRAY_ACCESSIBILITY, 318 IDR_AURA_UBER_TRAY_ACCESSIBILITY,
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 if (detailed_popup_) 430 if (detailed_popup_)
428 detailed_popup_->GetWidget()->Close(); 431 detailed_popup_->GetWidget()->Close();
429 if (detailed_menu_) 432 if (detailed_menu_)
430 detailed_menu_->GetWidget()->Close(); 433 detailed_menu_->GetWidget()->Close();
431 } 434 }
432 435
433 previous_accessibility_state_ = accessibility_state; 436 previous_accessibility_state_ = accessibility_state;
434 } 437 }
435 438
436 } // namespace ash 439 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_item_more.cc ('k') | ash/common/system/update/tray_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698