chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 11829040: Fix the content_browsertests everywhere maybe.

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Patch cleanup Created 7 years, 11 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 | « chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | ui/views/widget/native_widget_aura.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

7	7

8 #include "ash/launcher/launcher_types.h"	8 #include "ash/launcher/launcher_types.h"

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

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 virtual void OpenFeedbackPage() OVERRIDE;	76 virtual void OpenFeedbackPage() OVERRIDE;

77 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;	77 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;

78 virtual void HandleMediaNextTrack() OVERRIDE;	78 virtual void HandleMediaNextTrack() OVERRIDE;

79 virtual void HandleMediaPlayPause() OVERRIDE;	79 virtual void HandleMediaPlayPause() OVERRIDE;

80 virtual void HandleMediaPrevTrack() OVERRIDE;	80 virtual void HandleMediaPrevTrack() OVERRIDE;

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

82 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;	82 virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;

83 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;	83 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;

84 virtual double GetSavedScreenMagnifierScale() OVERRIDE;	84 virtual double GetSavedScreenMagnifierScale() OVERRIDE;

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

86 virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;

87 virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;	86 virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;

88	87

89 // content::NotificationObserver override:	88 // content::NotificationObserver override:

90 virtual void Observe(int type,	89 virtual void Observe(int type,

91 const content::NotificationSource& source,	90 const content::NotificationSource& source,

92 const content::NotificationDetails& details) OVERRIDE;	91 const content::NotificationDetails& details) OVERRIDE;

93	92

94 private:	93 private:

95 static ChromeShellDelegate* instance_;	94 static ChromeShellDelegate* instance_;

96	95

97 content::NotificationRegistrar registrar_;	96 content::NotificationRegistrar registrar_;

98	97

99 scoped_ptr<ash::WindowPositioner> window_positioner_;	98 scoped_ptr<ash::WindowPositioner> window_positioner_;

100	99

101 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	100 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

102	101

103 ChromeLauncherController* launcher_delegate_;	102 ChromeLauncherController* launcher_delegate_;

104	103

105 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	104 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

106 };	105 };

107	106

108 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	107 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW