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

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

Issue 10914231: Map fullscreen button to maximize (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 56 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
57 virtual ash::LauncherDelegate* CreateLauncherDelegate( 57 virtual ash::LauncherDelegate* CreateLauncherDelegate(
58 ash::LauncherModel* model) OVERRIDE; 58 ash::LauncherModel* model) OVERRIDE;
59 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate( 59 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
60 ash::SystemTray* tray) OVERRIDE; 60 ash::SystemTray* tray) OVERRIDE;
61 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 61 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
62 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 62 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
63 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 63 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
64 virtual void OpenFeedbackPage() OVERRIDE; 64 virtual void OpenFeedbackPage() OVERRIDE;
65 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE; 65 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;
66 virtual void RemoveFullScreenExitBubble() OVERRIDE;
66 virtual void HandleMediaNextTrack() OVERRIDE; 67 virtual void HandleMediaNextTrack() OVERRIDE;
67 virtual void HandleMediaPlayPause() OVERRIDE; 68 virtual void HandleMediaPlayPause() OVERRIDE;
68 virtual void HandleMediaPrevTrack() OVERRIDE; 69 virtual void HandleMediaPrevTrack() OVERRIDE;
69 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE; 70 virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
70 71
71 // content::NotificationObserver override: 72 // content::NotificationObserver override:
72 virtual void Observe(int type, 73 virtual void Observe(int type,
73 const content::NotificationSource& source, 74 const content::NotificationSource& source,
74 const content::NotificationDetails& details) OVERRIDE; 75 const content::NotificationDetails& details) OVERRIDE;
75 76
76 private: 77 private:
77 static ChromeShellDelegate* instance_; 78 static ChromeShellDelegate* instance_;
78 79
79 content::NotificationRegistrar registrar_; 80 content::NotificationRegistrar registrar_;
80 81
81 scoped_ptr<ash::WindowPositioner> window_positioner_; 82 scoped_ptr<ash::WindowPositioner> window_positioner_;
82 83
83 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_; 84 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 86 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
86 }; 87 };
87 88
88 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 89 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698