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

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

Issue 11411349: Uber menu: Place the a11y item just below the keyboard setting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | no next file » | 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 notifier->AddUserObserver(tray_user); 170 notifier->AddUserObserver(tray_user);
171 #if defined(OS_CHROMEOS) 171 #if defined(OS_CHROMEOS)
172 notifier->AddNetworkObserver(tray_network); 172 notifier->AddNetworkObserver(tray_network);
173 notifier->AddVpnObserver(tray_vpn); 173 notifier->AddVpnObserver(tray_vpn);
174 notifier->AddSmsObserver(tray_sms); 174 notifier->AddSmsObserver(tray_sms);
175 #endif 175 #endif
176 176
177 AddTrayItem(tray_logout_button); 177 AddTrayItem(tray_logout_button);
178 AddTrayItem(tray_user); 178 AddTrayItem(tray_user);
179 AddTrayItem(tray_ime); 179 AddTrayItem(tray_ime);
180 AddTrayItem(tray_accessibility);
180 AddTrayItem(tray_power); 181 AddTrayItem(tray_power);
181 #if defined(OS_CHROMEOS) 182 #if defined(OS_CHROMEOS)
182 AddTrayItem(tray_network); 183 AddTrayItem(tray_network);
183 AddTrayItem(tray_vpn); 184 AddTrayItem(tray_vpn);
184 AddTrayItem(tray_sms); 185 AddTrayItem(tray_sms);
185 #endif 186 #endif
186 AddTrayItem(tray_bluetooth); 187 AddTrayItem(tray_bluetooth);
187 AddTrayItem(tray_drive); 188 AddTrayItem(tray_drive);
188 AddTrayItem(tray_locale); 189 AddTrayItem(tray_locale);
189 AddTrayItem(tray_accessibility);
190 #if defined(OS_CHROMEOS) 190 #if defined(OS_CHROMEOS)
191 AddTrayItem(tray_display); 191 AddTrayItem(tray_display);
192 #endif 192 #endif
193 AddTrayItem(tray_volume); 193 AddTrayItem(tray_volume);
194 AddTrayItem(tray_brightness); 194 AddTrayItem(tray_brightness);
195 AddTrayItem(tray_update); 195 AddTrayItem(tray_update);
196 AddTrayItem(tray_caps_lock); 196 AddTrayItem(tray_caps_lock);
197 AddTrayItem(tray_settings); 197 AddTrayItem(tray_settings);
198 AddTrayItem(tray_date); 198 AddTrayItem(tray_date);
199 199
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 ConvertPointToWidget(this, &point); 583 ConvertPointToWidget(this, &point);
584 arrow_offset = point.x(); 584 arrow_offset = point.x();
585 } 585 }
586 } 586 }
587 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); 587 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
588 } 588 }
589 return true; 589 return true;
590 } 590 }
591 591
592 } // namespace ash 592 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698