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

Side by Side Diff: ash/system/tray/system_tray.cc

Issue 11519036: A11y: Add a browser test of TrayAccessibility. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test failure on win_rel Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray_accessibility.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/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell/panel_window.h" 9 #include "ash/shell/panel_window.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate) { 125 void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate) {
126 internal::TrayBackgroundView::Initialize(); 126 internal::TrayBackgroundView::Initialize();
127 CreateItems(delegate); 127 CreateItems(delegate);
128 } 128 }
129 129
130 void SystemTray::CreateItems(SystemTrayDelegate* delegate) { 130 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
131 AddTrayItem(new internal::TrayLogoutButton(this)); 131 AddTrayItem(new internal::TrayLogoutButton(this));
132 AddTrayItem(new internal::TrayUser(this)); 132 AddTrayItem(new internal::TrayUser(this));
133 AddTrayItem(new internal::TrayIME(this)); 133 AddTrayItem(new internal::TrayIME(this));
134 AddTrayItem(new internal::TrayAccessibility(this)); 134 tray_accessibility_ = new internal::TrayAccessibility(this);
135 AddTrayItem(tray_accessibility_);
135 AddTrayItem(new internal::TrayPower(this)); 136 AddTrayItem(new internal::TrayPower(this));
136 #if defined(OS_CHROMEOS) 137 #if defined(OS_CHROMEOS)
137 AddTrayItem(new internal::TrayNetwork(this)); 138 AddTrayItem(new internal::TrayNetwork(this));
138 AddTrayItem(new internal::TrayVPN(this)); 139 AddTrayItem(new internal::TrayVPN(this));
139 AddTrayItem(new internal::TraySms(this)); 140 AddTrayItem(new internal::TraySms(this));
140 #endif 141 #endif
141 AddTrayItem(new internal::TrayBluetooth(this)); 142 AddTrayItem(new internal::TrayBluetooth(this));
142 AddTrayItem(new internal::TrayDrive(this)); 143 AddTrayItem(new internal::TrayDrive(this));
143 AddTrayItem(new internal::TrayLocale(this)); 144 AddTrayItem(new internal::TrayLocale(this));
144 #if defined(OS_CHROMEOS) 145 #if defined(OS_CHROMEOS)
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 ConvertPointToWidget(this, &point); 540 ConvertPointToWidget(this, &point);
540 arrow_offset = point.x(); 541 arrow_offset = point.x();
541 } 542 }
542 } 543 }
543 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); 544 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
544 } 545 }
545 return true; 546 return true;
546 } 547 }
547 548
548 } // namespace ash 549 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray_accessibility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698