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

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

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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
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 <string> 8 #include <string>
9 9
10 #include "ash/shelf/shelf_item_types.h" 10 #include "ash/shelf/shelf_item_types.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 59 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
60 virtual ash::ShelfDelegate* CreateShelfDelegate( 60 virtual ash::ShelfDelegate* CreateShelfDelegate(
61 ash::ShelfModel* model) OVERRIDE; 61 ash::ShelfModel* model) OVERRIDE;
62 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 62 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
63 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 63 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
64 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 64 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
65 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 65 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
66 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 66 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
67 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 67 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
68 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; 68 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
69 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
69 virtual ui::MenuModel* CreateContextMenu( 70 virtual ui::MenuModel* CreateContextMenu(
70 aura::Window* root, 71 aura::Window* root,
71 ash::ShelfItemDelegate* item_delegate, 72 ash::ShelfItemDelegate* item_delegate,
72 ash::ShelfItem* item) OVERRIDE; 73 ash::ShelfItem* item) OVERRIDE;
73 virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE; 74 virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
74 virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE; 75 virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE;
75 virtual base::string16 GetProductName() const OVERRIDE; 76 virtual base::string16 GetProductName() const OVERRIDE;
76 77
77 // content::NotificationObserver override: 78 // content::NotificationObserver override:
78 virtual void Observe(int type, 79 virtual void Observe(int type,
(...skipping 11 matching lines...) Expand all
90 91
91 #if defined(OS_CHROMEOS) 92 #if defined(OS_CHROMEOS)
92 scoped_ptr<chromeos::DisplayConfigurationObserver> 93 scoped_ptr<chromeos::DisplayConfigurationObserver>
93 display_configuration_observer_; 94 display_configuration_observer_;
94 #endif 95 #endif
95 96
96 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 97 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
97 }; 98 };
98 99
99 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 100 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/test/test_shell_delegate.cc ('k') | trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698