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

Unified Diff: ash/app_list/app_list_view.h

Issue 10381018: ash: First pass of Applist v2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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
« no previous file with comments | « ash/app_list/app_list_model_view.cc ('k') | ash/app_list/app_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/app_list/app_list_view.h
diff --git a/ash/app_list/app_list_view.h b/ash/app_list/app_list_view.h
index 541b26693d01dea697207ba1c5c318b304b80e94..73e9543841c0e71abddbcd4a8577b11a09cb75eb 100644
--- a/ash/app_list/app_list_view.h
+++ b/ash/app_list/app_list_view.h
@@ -7,8 +7,8 @@
#pragma once
#include "base/memory/scoped_ptr.h"
+#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/button/button.h"
-#include "ui/views/widget/widget_delegate.h"
namespace views {
class View;
@@ -16,28 +16,31 @@ class View;
namespace ash {
+class AppListBubbleBorder;
class AppListModel;
class AppListModelView;
class AppListViewDelegate;
+class PaginationModel;
// AppListView is the top-level view and controller of app list UI. It creates
// and hosts a AppListModelView and passes AppListModel to it for display.
-class AppListView : public views::WidgetDelegateView,
+class AppListView : public views::BubbleDelegateView,
public views::ButtonListener {
public:
// Takes ownership of |delegate|.
- AppListView(AppListViewDelegate* delegate,
- const gfx::Rect& bounds);
+ explicit AppListView(AppListViewDelegate* delegate);
virtual ~AppListView();
void AnimateShow(int duration_ms);
void AnimateHide(int duration_ms);
void Close();
+ void UpdateBounds();
private:
// Initializes the window.
- void Init(const gfx::Rect& bounds);
+ void InitAsFullscreenWidget();
+ void InitAsBubble();
// Updates model using query text in search box.
void UpdateModel();
@@ -54,10 +57,17 @@ class AppListView : public views::WidgetDelegateView,
virtual void ButtonPressed(views::Button* sender,
const views::Event& event) OVERRIDE;
- scoped_ptr<AppListModel> model_;
+ // Overridden from views::BubbleDelegate:
+ virtual gfx::Rect GetBubbleBounds() OVERRIDE;
+ scoped_ptr<AppListModel> model_;
scoped_ptr<AppListViewDelegate> delegate_;
+ // PaginationModel for model view and page switcher.
+ scoped_ptr<PaginationModel> pagination_model_;
+
+ bool bubble_style_;
+ AppListBubbleBorder* bubble_border_; // Owned by views hierarchy.
AppListModelView* model_view_;
DISALLOW_COPY_AND_ASSIGN(AppListView);
« no previous file with comments | « ash/app_list/app_list_model_view.cc ('k') | ash/app_list/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698