| OLD | NEW |
| 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 GetAppropriateBrowser()->OpenOptionsDialog(); | 323 GetAppropriateBrowser()->OpenOptionsDialog(); |
| 324 } | 324 } |
| 325 | 325 |
| 326 virtual void ShowIMESettings() OVERRIDE { | 326 virtual void ShowIMESettings() OVERRIDE { |
| 327 content::RecordAction( | 327 content::RecordAction( |
| 328 content::UserMetricsAction("OpenLanguageOptionsDialog")); | 328 content::UserMetricsAction("OpenLanguageOptionsDialog")); |
| 329 GetAppropriateBrowser()->ShowOptionsTab(chrome::kLanguageOptionsSubPage); | 329 GetAppropriateBrowser()->ShowOptionsTab(chrome::kLanguageOptionsSubPage); |
| 330 } | 330 } |
| 331 | 331 |
| 332 virtual void ShowHelp() OVERRIDE { | 332 virtual void ShowHelp() OVERRIDE { |
| 333 GetAppropriateBrowser()->ShowHelpTab(); | 333 GetAppropriateBrowser()->ShowHelpTab(Browser::HELP_SOURCE_MENU); |
| 334 } | 334 } |
| 335 | 335 |
| 336 virtual bool IsAudioMuted() const OVERRIDE { | 336 virtual bool IsAudioMuted() const OVERRIDE { |
| 337 return AudioHandler::GetInstance()->IsMuted(); | 337 return AudioHandler::GetInstance()->IsMuted(); |
| 338 } | 338 } |
| 339 | 339 |
| 340 virtual void SetAudioMuted(bool muted) OVERRIDE { | 340 virtual void SetAudioMuted(bool muted) OVERRIDE { |
| 341 return AudioHandler::GetInstance()->SetMuted(muted); | 341 return AudioHandler::GetInstance()->SetMuted(muted); |
| 342 } | 342 } |
| 343 | 343 |
| (...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1238 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1238 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
| 1239 }; | 1239 }; |
| 1240 | 1240 |
| 1241 } // namespace | 1241 } // namespace |
| 1242 | 1242 |
| 1243 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { | 1243 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { |
| 1244 return new chromeos::SystemTrayDelegate(tray); | 1244 return new chromeos::SystemTrayDelegate(tray); |
| 1245 } | 1245 } |
| 1246 | 1246 |
| 1247 } // namespace chromeos | 1247 } // namespace chromeos |
| OLD | NEW |