| 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/ui/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include "ash/launcher/launcher_types.h" | 7 #include "ash/launcher/launcher_types.h" |
| 8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
| 9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 #endif | 438 #endif |
| 439 } | 439 } |
| 440 | 440 |
| 441 void ChromeShellDelegate::HandleMediaPrevTrack() { | 441 void ChromeShellDelegate::HandleMediaPrevTrack() { |
| 442 #if defined(OS_CHROMEOS) | 442 #if defined(OS_CHROMEOS) |
| 443 ExtensionMediaPlayerEventRouter::GetInstance()->NotifyPrevTrack(); | 443 ExtensionMediaPlayerEventRouter::GetInstance()->NotifyPrevTrack(); |
| 444 #endif | 444 #endif |
| 445 } | 445 } |
| 446 | 446 |
| 447 string16 ChromeShellDelegate::GetTimeRemainingString(base::TimeDelta delta) { | 447 string16 ChromeShellDelegate::GetTimeRemainingString(base::TimeDelta delta) { |
| 448 return TimeFormat::TimeRemaining(delta); | 448 return TimeFormat::TimeRemainingLong(delta); |
| 449 } | 449 } |
| 450 | 450 |
| 451 void ChromeShellDelegate::SaveScreenMagnifierScale(double scale) { | 451 void ChromeShellDelegate::SaveScreenMagnifierScale(double scale) { |
| 452 #if defined(OS_CHROMEOS) | 452 #if defined(OS_CHROMEOS) |
| 453 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); | 453 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); |
| 454 profile->GetPrefs()->SetDouble(prefs::kScreenMagnifierScale, scale); | 454 profile->GetPrefs()->SetDouble(prefs::kScreenMagnifierScale, scale); |
| 455 #endif | 455 #endif |
| 456 } | 456 } |
| 457 | 457 |
| 458 double ChromeShellDelegate::GetSavedScreenMagnifierScale() { | 458 double ChromeShellDelegate::GetSavedScreenMagnifierScale() { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 481 ash::Shell::GetInstance()->ShowLauncher(); | 481 ash::Shell::GetInstance()->ShowLauncher(); |
| 482 break; | 482 break; |
| 483 default: | 483 default: |
| 484 NOTREACHED() << "Unexpected notification " << type; | 484 NOTREACHED() << "Unexpected notification " << type; |
| 485 } | 485 } |
| 486 #else | 486 #else |
| 487 // MSVC++ warns about switch statements without any cases. | 487 // MSVC++ warns about switch statements without any cases. |
| 488 NOTREACHED() << "Unexpected notification " << type; | 488 NOTREACHED() << "Unexpected notification " << type; |
| 489 #endif | 489 #endif |
| 490 } | 490 } |
| OLD | NEW |