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

Unified Diff: ui/app_list/app_list_item_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_item_model_observer.h ('k') | ui/app_list/app_list_item_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_item_view.h
===================================================================
--- ui/app_list/app_list_item_view.h (revision 0)
+++ ui/app_list/app_list_item_view.h (working copy)
@@ -2,15 +2,17 @@
// 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_ITEM_VIEW_H_
-#define ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
+#ifndef UI_APP_LIST_APP_LIST_ITEM_VIEW_H_
+#define UI_APP_LIST_APP_LIST_ITEM_VIEW_H_
#pragma once
-#include "ash/app_list/app_list_item_model_observer.h"
-#include "ash/ash_export.h"
+#include <string>
+
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "ui/app_list/app_list_export.h"
+#include "ui/app_list/app_list_item_model_observer.h"
#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/custom_button.h"
@@ -21,15 +23,15 @@
class MenuRunner;
}
-namespace ash {
+namespace app_list {
class AppListItemModel;
class AppListModelView;
class DropShadowLabel;
-class ASH_EXPORT AppListItemView : public views::CustomButton,
- public views::ContextMenuController,
- public AppListItemModelObserver {
+class APP_LIST_EXPORT AppListItemView : public views::CustomButton,
+ public views::ContextMenuController,
+ public AppListItemModelObserver {
public:
AppListItemView(AppListModelView* list_model_view,
AppListItemModel* model,
@@ -105,6 +107,6 @@
DISALLOW_COPY_AND_ASSIGN(AppListItemView);
};
-} // namespace ash
+} // namespace app_list
-#endif // ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
+#endif // UI_APP_LIST_APP_LIST_ITEM_VIEW_H_
« no previous file with comments | « ui/app_list/app_list_item_model_observer.h ('k') | ui/app_list/app_list_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698