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

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: 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 64 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
65 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 65 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
66 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 66 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
67 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; 67 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
68 virtual ui::MenuModel* CreateContextMenu( 68 virtual ui::MenuModel* CreateContextMenu(
69 aura::Window* root, 69 aura::Window* root,
70 ash::ShelfItemDelegate* item_delegate, 70 ash::ShelfItemDelegate* item_delegate,
71 ash::ShelfItem* item) OVERRIDE; 71 ash::ShelfItem* item) OVERRIDE;
72 virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
73 virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE; 72 virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE;
74 virtual base::string16 GetProductName() const OVERRIDE; 73 virtual base::string16 GetProductName() const OVERRIDE;
75 74
76 // content::NotificationObserver override: 75 // content::NotificationObserver override:
77 virtual void Observe(int type, 76 virtual void Observe(int type,
78 const content::NotificationSource& source, 77 const content::NotificationSource& source,
79 const content::NotificationDetails& details) OVERRIDE; 78 const content::NotificationDetails& details) OVERRIDE;
80 79
81 private: 80 private:
82 void PlatformInit(); 81 void PlatformInit();
83 82
84 static ChromeShellDelegate* instance_; 83 static ChromeShellDelegate* instance_;
85 84
86 content::NotificationRegistrar registrar_; 85 content::NotificationRegistrar registrar_;
87 86
88 ChromeLauncherController* shelf_delegate_; 87 ChromeLauncherController* shelf_delegate_;
89 88
90 #if defined(OS_CHROMEOS) 89 #if defined(OS_CHROMEOS)
91 scoped_ptr<chromeos::DisplayConfigurationObserver> 90 scoped_ptr<chromeos::DisplayConfigurationObserver>
92 display_configuration_observer_; 91 display_configuration_observer_;
93 #endif 92 #endif
94 93
95 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 94 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
96 }; 95 };
97 96
98 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 97 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698