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

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

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 69 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
70 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 70 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
71 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 71 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
72 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 72 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
73 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 73 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
74 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; 74 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
75 virtual ui::MenuModel* CreateContextMenu( 75 virtual ui::MenuModel* CreateContextMenu(
76 aura::Window* root, 76 aura::Window* root,
77 ash::ShelfItemDelegate* item_delegate, 77 ash::ShelfItemDelegate* item_delegate,
78 ash::ShelfItem* item) OVERRIDE; 78 ash::ShelfItem* item) OVERRIDE;
79 virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
80 virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE; 79 virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE;
81 virtual base::string16 GetProductName() const OVERRIDE; 80 virtual base::string16 GetProductName() const OVERRIDE;
82 81
83 // content::NotificationObserver override: 82 // content::NotificationObserver override:
84 virtual void Observe(int type, 83 virtual void Observe(int type,
85 const content::NotificationSource& source, 84 const content::NotificationSource& source,
86 const content::NotificationDetails& details) OVERRIDE; 85 const content::NotificationDetails& details) OVERRIDE;
87 86
88 private: 87 private:
89 void PlatformInit(); 88 void PlatformInit();
90 89
91 static ChromeShellDelegate* instance_; 90 static ChromeShellDelegate* instance_;
92 91
93 content::NotificationRegistrar registrar_; 92 content::NotificationRegistrar registrar_;
94 93
95 ChromeLauncherController* shelf_delegate_; 94 ChromeLauncherController* shelf_delegate_;
96 95
97 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; 96 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
98 97
99 #if defined(OS_CHROMEOS) 98 #if defined(OS_CHROMEOS)
100 scoped_ptr<chromeos::DisplayConfigurationObserver> 99 scoped_ptr<chromeos::DisplayConfigurationObserver>
101 display_configuration_observer_; 100 display_configuration_observer_;
102 #endif 101 #endif
103 102
104 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 103 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
105 }; 104 };
106 105
107 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 106 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698