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

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

Issue 683473005: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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.h ('k') | ash/system/tray_update.h » ('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/system/tray_accessibility.h" 5 #include "ash/system/tray_accessibility.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/metrics/user_metrics_recorder.h" 8 #include "ash/metrics/user_metrics_recorder.h"
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); 77 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
78 SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK). 78 SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK).
79 ToImageSkia()); 79 ToImageSkia());
80 base::string16 label = bundle.GetLocalizedString( 80 base::string16 label = bundle.GetLocalizedString(
81 IDS_ASH_STATUS_TRAY_ACCESSIBILITY); 81 IDS_ASH_STATUS_TRAY_ACCESSIBILITY);
82 SetLabel(label); 82 SetLabel(label);
83 SetAccessibleName(label); 83 SetAccessibleName(label);
84 set_id(test::kAccessibilityTrayItemViewId); 84 set_id(test::kAccessibilityTrayItemViewId);
85 } 85 }
86 86
87 virtual ~DefaultAccessibilityView() { 87 ~DefaultAccessibilityView() override {}
88 }
89 88
90 private: 89 private:
91 DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView); 90 DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView);
92 }; 91 };
93 92
94 //////////////////////////////////////////////////////////////////////////////// 93 ////////////////////////////////////////////////////////////////////////////////
95 // ash::tray::AccessibilityPopupView 94 // ash::tray::AccessibilityPopupView
96 95
97 AccessibilityPopupView::AccessibilityPopupView(SystemTrayItem* owner, 96 AccessibilityPopupView::AccessibilityPopupView(SystemTrayItem* owner,
98 uint32 enabled_state_bits) 97 uint32 enabled_state_bits)
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 if (detailed_popup_) 431 if (detailed_popup_)
433 detailed_popup_->GetWidget()->Close(); 432 detailed_popup_->GetWidget()->Close();
434 if (detailed_menu_) 433 if (detailed_menu_)
435 detailed_menu_->GetWidget()->Close(); 434 detailed_menu_->GetWidget()->Close();
436 } 435 }
437 436
438 previous_accessibility_state_ = accessibility_state; 437 previous_accessibility_state_ = accessibility_state;
439 } 438 }
440 439
441 } // namespace ash 440 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray_accessibility.h ('k') | ash/system/tray_update.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698