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

Unified Diff: ui/app_list/app_list_item_model.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_export.h ('k') | ui/app_list/app_list_item_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_item_model.h
===================================================================
--- ui/app_list/app_list_item_model.h (revision 0)
+++ ui/app_list/app_list_item_model.h (working copy)
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_MODEL_H_
-#define UI_AURA_SHELL_APP_LIST_APP_LIST_ITEM_MODEL_H_
+#ifndef UI_APP_LIST_APP_LIST_ITEM_MODEL_H_
+#define UI_APP_LIST_APP_LIST_ITEM_MODEL_H_
#pragma once
#include <string>
@@ -11,19 +11,19 @@
#include "base/basictypes.h"
#include "base/observer_list.h"
#include "third_party/skia/include/core/SkBitmap.h"
-#include "ash/ash_export.h"
+#include "ui/app_list/app_list_export.h"
namespace ui {
class MenuModel;
}
-namespace ash {
+namespace app_list {
class AppListItemModelObserver;
// AppListItemModel provides icon and title to be shown in a AppListItemView
// and action to be executed when the AppListItemView is activated.
-class ASH_EXPORT AppListItemModel {
+class APP_LIST_EXPORT AppListItemModel {
public:
AppListItemModel();
virtual ~AppListItemModel();
@@ -60,6 +60,6 @@
DISALLOW_COPY_AND_ASSIGN(AppListItemModel);
};
-} // namespace ash
+} // namespace app_list
-#endif // #define ASH_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
+#endif // UI_APP_LIST_APP_LIST_ITEM_MODEL_H_
« no previous file with comments | « ui/app_list/app_list_export.h ('k') | ui/app_list/app_list_item_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698