ash/test/test_shell_delegate.h - Issue 11175077: Fix the low battery notification string from mins -> minutes.

Side by Side Diff: ash/test/test_shell_delegate.h

Issue 11175077: Fix the low battery notification string from mins -> minutes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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

« no previous file with comments | « ash/system/power/power_status_view.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('J')

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 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_	5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_

6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_	6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_

7	7

8 #include "ash/shell_delegate.h"	8 #include "ash/shell_delegate.h"

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 ash::LauncherModel* model) OVERRIDE;	44 ash::LauncherModel* model) OVERRIDE;

45 virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;	45 virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;

46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	46 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;	47 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

48 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;	48 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

49 virtual void OpenFeedbackPage() OVERRIDE;	49 virtual void OpenFeedbackPage() OVERRIDE;

50 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;	50 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;

51 virtual void HandleMediaNextTrack() OVERRIDE;	51 virtual void HandleMediaNextTrack() OVERRIDE;

52 virtual void HandleMediaPlayPause() OVERRIDE;	52 virtual void HandleMediaPlayPause() OVERRIDE;

53 virtual void HandleMediaPrevTrack() OVERRIDE;	53 virtual void HandleMediaPrevTrack() OVERRIDE;

54 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;

55 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;	54 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;

56 virtual double GetSavedScreenMagnifierScale() OVERRIDE;	55 virtual double GetSavedScreenMagnifierScale() OVERRIDE;

57 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;	56 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;

58	57

59 int num_exit_requests() const { return num_exit_requests_; }	58 int num_exit_requests() const { return num_exit_requests_; }

60 private:	59 private:

61 bool locked_;	60 bool locked_;

62 bool spoken_feedback_enabled_;	61 bool spoken_feedback_enabled_;

63 int num_exit_requests_;	62 int num_exit_requests_;

64	63

65 scoped_ptr<content::BrowserContext> current_browser_context_;	64 scoped_ptr<content::BrowserContext> current_browser_context_;

66	65

67 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);	66 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);

68 };	67 };

69	68

70 } // namespace test	69 } // namespace test

71 } // namespace ash	70 } // namespace ash

72	71

73 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_	72 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_

OLD	NEW