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

Unified Diff: ui/app_list/app_list_view.h

Issue 10388032: Move app list from ash to ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix win_aura bot and comments in #5 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 | « ui/app_list/app_list_model_view_unittest.cc ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_view.h
===================================================================
--- ui/app_list/app_list_view.h (revision 0)
+++ ui/app_list/app_list_view.h (working copy)
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_APP_LIST_APP_LIST_VIEW_H_
-#define ASH_APP_LIST_APP_LIST_VIEW_H_
+#ifndef UI_APP_LIST_APP_LIST_VIEW_H_
+#define UI_APP_LIST_APP_LIST_VIEW_H_
#pragma once
#include "base/memory/scoped_ptr.h"
+#include "ui/app_list/app_list_export.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/button/button.h"
@@ -14,7 +15,7 @@
class View;
}
-namespace ash {
+namespace app_list {
class AppListBubbleBorder;
class AppListModel;
@@ -24,24 +25,27 @@
// 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::BubbleDelegateView,
- public views::ButtonListener {
+class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
+ public views::ButtonListener {
public:
// Takes ownership of |delegate|.
explicit AppListView(AppListViewDelegate* delegate);
virtual ~AppListView();
+ // Initializes the widget.
+ void InitAsFullscreenWidget(gfx::NativeView parent,
+ const gfx::Rect& screen_bounds,
+ const gfx::Rect& work_area);
+ void InitAsBubble(gfx::NativeView parent, views::View* anchor);
+
void AnimateShow(int duration_ms);
void AnimateHide(int duration_ms);
void Close();
- void UpdateBounds();
+ void UpdateBounds(const gfx::Rect& screen_bounds,
+ const gfx::Rect& work_area);
private:
- // Initializes the window.
- void InitAsFullscreenWidget();
- void InitAsBubble();
-
// Updates model using query text in search box.
void UpdateModel();
@@ -70,9 +74,13 @@
AppListBubbleBorder* bubble_border_; // Owned by views hierarchy.
AppListModelView* model_view_;
+ // Work area in screen coordinates to layout app list. This is used for
+ // full screen mode.
+ gfx::Rect work_area_;
+
DISALLOW_COPY_AND_ASSIGN(AppListView);
};
-} // namespace ash
+} // namespace app_list
-#endif // ASH_APP_LIST_APP_LIST_VIEW_H_
+#endif // UI_APP_LIST_APP_LIST_VIEW_H_
« no previous file with comments | « ui/app_list/app_list_model_view_unittest.cc ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698