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

Unified Diff: chrome/browser/ui/views/aura/chrome_shell_delegate.h

Issue 8500005: Reverting this as it breaks (at least) the Windows Aura build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/aura/chrome_shell_delegate.h
===================================================================
--- chrome/browser/ui/views/aura/chrome_shell_delegate.h (revision 110804)
+++ chrome/browser/ui/views/aura/chrome_shell_delegate.h (working copy)
@@ -12,22 +12,14 @@
#include "ui/aura_shell/launcher/launcher_types.h"
#include "ui/aura_shell/shell_delegate.h"
-class Browser;
class StatusAreaHostAura;
+class Browser;
-namespace views {
-class View;
-}
-
class ChromeShellDelegate : public aura_shell::ShellDelegate {
public:
ChromeShellDelegate();
virtual ~ChromeShellDelegate();
- static ChromeShellDelegate* instance() { return instance_; }
-
- const views::View* GetStatusArea() const;
-
// Returns whether a launcher item should be created for |browser|. If an item
// should be created |type| is set to the launcher type to create.
static bool ShouldCreateLauncherItemForBrowser(
@@ -43,8 +35,6 @@
virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE;
private:
- static ChromeShellDelegate* instance_;
-
scoped_ptr<StatusAreaHostAura> status_area_host_;
DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
« no previous file with comments | « chrome/browser/chromeos/status/timezone_clock_updater.cc ('k') | chrome/browser/ui/views/aura/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698