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

Unified Diff: ui/app_list/app_list_model_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.cc ('k') | ui/app_list/app_list_model_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_model_view.h
===================================================================
--- ui/app_list/app_list_model_view.h (revision 0)
+++ ui/app_list/app_list_model_view.h (working copy)
@@ -2,12 +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_MODEL_VIEW_H_
-#define ASH_APP_LIST_APP_LIST_MODEL_VIEW_H_
+#ifndef UI_APP_LIST_APP_LIST_MODEL_VIEW_H_
+#define UI_APP_LIST_APP_LIST_MODEL_VIEW_H_
#pragma once
-#include "ash/ash_export.h"
-#include "ash/app_list/pagination_model_observer.h"
+#include "ui/app_list/app_list_export.h"
+#include "ui/app_list/pagination_model_observer.h"
#include "ui/base/models/list_model_observer.h"
#include "ui/views/view.h"
@@ -15,14 +15,14 @@
class ButtonListener;
}
-namespace ash {
+namespace app_list {
class AppListItemView;
class AppListModel;
class PaginationModel;
// AppListModelView displays the UI for an AppListModel.
-class ASH_EXPORT AppListModelView : public views::View,
+class APP_LIST_EXPORT AppListModelView : public views::View,
public ui::ListModelObserver,
public PaginationModelObserver {
public:
@@ -52,6 +52,10 @@
return cols_ * rows_per_page_;
}
+ bool fixed_layout() const {
+ return fixed_layout_;
+ }
+
private:
// Updates from model.
void Update();
@@ -89,6 +93,6 @@
DISALLOW_COPY_AND_ASSIGN(AppListModelView);
};
-} // namespace ash
+} // namespace app_list
-#endif // ASH_APP_LIST_APP_LIST_MODEL_VIEW_H_
+#endif // UI_APP_LIST_APP_LIST_MODEL_VIEW_H_
« no previous file with comments | « ui/app_list/app_list_model.cc ('k') | ui/app_list/app_list_model_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698