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

Unified Diff: ui/aura_shell/launcher/launcher_view.h

Issue 8247012: Positions the launcher in the bottom left corner. Adds ShellDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix TestDesktopDelegate Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ui/aura_shell/launcher/launcher_view.h
diff --git a/ui/aura_shell/launcher/launcher_view.h b/ui/aura_shell/launcher/launcher_view.h
index d7b6e793021babdd9531d3be20632b7372db02e7..fd057993121a61dc470f36f28a7327cc2cbe67df 100644
--- a/ui/aura_shell/launcher/launcher_view.h
+++ b/ui/aura_shell/launcher/launcher_view.h
@@ -6,27 +6,38 @@
#define UI_AURA_SHELL_LAUNCHER_VIEW_H_
#pragma once
+#include "base/memory/scoped_ptr.h"
#include "ui/aura_shell/launcher/launcher_model_observer.h"
+#include "views/controls/button/button.h"
#include "views/widget/widget_delegate.h"
+namespace views {
+class ImageButton;
+}
+
namespace aura_shell {
+struct LauncherItem;
class LauncherModel;
namespace internal {
-class LauncherButton;
-
class LauncherView : public views::WidgetDelegateView,
- public LauncherModelObserver {
+ public LauncherModelObserver,
+ public views::ButtonListener {
public:
LauncherView();
virtual ~LauncherView();
- // Populates this LauncherView from the contents of |model|.
- void Init(LauncherModel* model);
+ void Init();
private:
+ // Creates the view used to represent |item|.
+ views::View* CreateViewForItem(const LauncherItem& item);
+
+ // Resizes the widget to fit the view.
+ void Resize();
+
// Overridden from views::View:
virtual void Layout() OVERRIDE;
virtual gfx::Size GetPreferredSize() OVERRIDE;
@@ -34,10 +45,18 @@ class LauncherView : public views::WidgetDelegateView,
// Overridden from LauncherModelObserver:
virtual void LauncherItemAdded(int index) OVERRIDE;
virtual void LauncherItemRemoved(int index) OVERRIDE;
- virtual void LauncherSelectionChanged() OVERRIDE;
+ virtual void LauncherItemImagesChanged(int index) OVERRIDE;
+
+ // Overriden from views::ButtonListener:
+ virtual void ButtonPressed(views::Button* sender,
+ const views::Event& event) OVERRIDE;
// The model, we don't own it.
- LauncherModel* model_;
+ scoped_ptr<LauncherModel> model_;
+
+ views::ImageButton* new_browser_button_;
+
+ views::ImageButton* show_apps_button_;
DISALLOW_COPY_AND_ASSIGN(LauncherView);
};

Powered by Google App Engine
This is Rietveld 408576698