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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10546072: Use different help URLs for menus, accelerators, and WebUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac compile Created 8 years, 6 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 | Annotate | Revision Log
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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 GetAppropriateBrowser()->OpenOptionsDialog(); 322 GetAppropriateBrowser()->OpenOptionsDialog();
323 } 323 }
324 324
325 virtual void ShowIMESettings() OVERRIDE { 325 virtual void ShowIMESettings() OVERRIDE {
326 content::RecordAction( 326 content::RecordAction(
327 content::UserMetricsAction("OpenLanguageOptionsDialog")); 327 content::UserMetricsAction("OpenLanguageOptionsDialog"));
328 GetAppropriateBrowser()->ShowOptionsTab(chrome::kLanguageOptionsSubPage); 328 GetAppropriateBrowser()->ShowOptionsTab(chrome::kLanguageOptionsSubPage);
329 } 329 }
330 330
331 virtual void ShowHelp() OVERRIDE { 331 virtual void ShowHelp() OVERRIDE {
332 GetAppropriateBrowser()->ShowHelpTab(); 332 GetAppropriateBrowser()->ShowHelpTab(Browser::HELP_SOURCE_MENU);
333 } 333 }
334 334
335 virtual bool IsAudioMuted() const OVERRIDE { 335 virtual bool IsAudioMuted() const OVERRIDE {
336 return AudioHandler::GetInstance()->IsMuted(); 336 return AudioHandler::GetInstance()->IsMuted();
337 } 337 }
338 338
339 virtual void SetAudioMuted(bool muted) OVERRIDE { 339 virtual void SetAudioMuted(bool muted) OVERRIDE {
340 return AudioHandler::GetInstance()->SetMuted(muted); 340 return AudioHandler::GetInstance()->SetMuted(muted);
341 } 341 }
342 342
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1236 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1237 }; 1237 };
1238 1238
1239 } // namespace 1239 } // namespace
1240 1240
1241 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1241 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1242 return new chromeos::SystemTrayDelegate(tray); 1242 return new chromeos::SystemTrayDelegate(tray);
1243 } 1243 }
1244 1244
1245 } // namespace chromeos 1245 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698