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

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

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura Created 8 years, 1 month 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 #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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 66 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
67 virtual void OpenFeedbackPage() OVERRIDE; 67 virtual void OpenFeedbackPage() OVERRIDE;
68 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE; 68 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;
69 virtual void HandleMediaNextTrack() OVERRIDE; 69 virtual void HandleMediaNextTrack() OVERRIDE;
70 virtual void HandleMediaPlayPause() OVERRIDE; 70 virtual void HandleMediaPlayPause() OVERRIDE;
71 virtual void HandleMediaPrevTrack() OVERRIDE; 71 virtual void HandleMediaPrevTrack() OVERRIDE;
72 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE; 72 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
73 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE; 73 virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
74 virtual double GetSavedScreenMagnifierScale() OVERRIDE; 74 virtual double GetSavedScreenMagnifierScale() OVERRIDE;
75 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE; 75 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
76 virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;
76 77
77 // content::NotificationObserver override: 78 // content::NotificationObserver override:
78 virtual void Observe(int type, 79 virtual void Observe(int type,
79 const content::NotificationSource& source, 80 const content::NotificationSource& source,
80 const content::NotificationDetails& details) OVERRIDE; 81 const content::NotificationDetails& details) OVERRIDE;
81 82
82 private: 83 private:
83 static ChromeShellDelegate* instance_; 84 static ChromeShellDelegate* instance_;
84 85
85 content::NotificationRegistrar registrar_; 86 content::NotificationRegistrar registrar_;
86 87
87 scoped_ptr<ash::WindowPositioner> window_positioner_; 88 scoped_ptr<ash::WindowPositioner> window_positioner_;
88 89
89 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_; 90 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;
90 91
91 ChromeLauncherController* launcher_delegate_; 92 ChromeLauncherController* launcher_delegate_;
92 93
93 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 94 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
94 }; 95 };
95 96
96 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 97 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_unittest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698