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

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

Issue 11428105: Uber menu: Place the a11y item just below the locale 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 AddTrayItem(tray_ime); 179 AddTrayItem(tray_ime);
180 AddTrayItem(tray_power); 180 AddTrayItem(tray_power);
181 #if defined(OS_CHROMEOS) 181 #if defined(OS_CHROMEOS)
182 AddTrayItem(tray_network); 182 AddTrayItem(tray_network);
183 AddTrayItem(tray_vpn); 183 AddTrayItem(tray_vpn);
184 AddTrayItem(tray_sms); 184 AddTrayItem(tray_sms);
185 #endif 185 #endif
186 AddTrayItem(tray_bluetooth); 186 AddTrayItem(tray_bluetooth);
187 AddTrayItem(tray_drive); 187 AddTrayItem(tray_drive);
188 AddTrayItem(tray_locale); 188 AddTrayItem(tray_locale);
189 AddTrayItem(tray_accessibility);
189 #if defined(OS_CHROMEOS) 190 #if defined(OS_CHROMEOS)
190 AddTrayItem(tray_display); 191 AddTrayItem(tray_display);
191 #endif 192 #endif
192 AddTrayItem(tray_volume); 193 AddTrayItem(tray_volume);
193 AddTrayItem(tray_brightness); 194 AddTrayItem(tray_brightness);
194 AddTrayItem(tray_update); 195 AddTrayItem(tray_update);
195 AddTrayItem(tray_accessibility);
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
200 #if defined(OS_LINUX) 200 #if defined(OS_LINUX)
201 // Add memory monitor if enabled. 201 // Add memory monitor if enabled.
202 CommandLine* cmd = CommandLine::ForCurrentProcess(); 202 CommandLine* cmd = CommandLine::ForCurrentProcess();
203 if (cmd->HasSwitch(ash::switches::kAshEnableMemoryMonitor)) 203 if (cmd->HasSwitch(ash::switches::kAshEnableMemoryMonitor))
204 AddTrayItem(new internal::TrayMonitor(this)); 204 AddTrayItem(new internal::TrayMonitor(this));
205 #endif 205 #endif
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 ConvertPointToWidget(this, &point); 582 ConvertPointToWidget(this, &point);
583 arrow_offset = point.x(); 583 arrow_offset = point.x();
584 } 584 }
585 } 585 }
586 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset); 586 ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
587 } 587 }
588 return true; 588 return true;
589 } 589 }
590 590
591 } // namespace ash 591 } // 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