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

Unified Diff: ui/app_list/app_list_item_view.cc

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_view.h ('k') | ui/app_list/app_list_model.h » ('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.cc
===================================================================
--- ui/app_list/app_list_item_view.cc (revision 0)
+++ ui/app_list/app_list_item_view.cc (working copy)
@@ -2,18 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/app_list/app_list_item_view.h"
+#include "ui/app_list/app_list_item_view.h"
-#include "ash/app_list/app_list.h"
-#include "ash/app_list/app_list_item_model.h"
-#include "ash/app_list/app_list_model_view.h"
-#include "ash/app_list/drop_shadow_label.h"
-#include "ash/app_list/icon_cache.h"
+#include <algorithm>
+
#include "base/bind.h"
#include "base/message_loop.h"
#include "base/synchronization/cancellation_flag.h"
#include "base/threading/worker_pool.h"
#include "base/utf_string_conversions.h"
+#include "ui/app_list/app_list_item_model.h"
+#include "ui/app_list/app_list_model_view.h"
+#include "ui/app_list/drop_shadow_label.h"
+#include "ui/app_list/icon_cache.h"
#include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/animation/throb_animation.h"
#include "ui/base/resource/resource_bundle.h"
@@ -26,7 +27,7 @@
#include "ui/views/controls/menu/menu_model_adapter.h"
#include "ui/views/controls/menu/menu_runner.h"
-namespace ash {
+namespace app_list {
namespace {
@@ -102,7 +103,7 @@
} // namespace
// static
-const char AppListItemView::kViewClassName[] = "ash/app_list/AppListItemView";
+const char AppListItemView::kViewClassName[] = "ui/app_list/AppListItemView";
// AppListItemView::IconOperation wraps background icon processing.
class AppListItemView::IconOperation
@@ -188,7 +189,7 @@
ALLOW_THIS_IN_INITIALIZER_LIST(apply_shadow_factory_(this)) {
title_->SetBackgroundColor(0);
- if (internal::AppList::UseAppListV2()) {
+ if (list_model_view_->fixed_layout()) {
title_->SetEnabledColor(kTitleColorV2);
} else {
title_->SetEnabledColor(kTitleColor);
@@ -400,4 +401,4 @@
}
}
-} // namespace ash
+} // namespace app_list
« no previous file with comments | « ui/app_list/app_list_item_view.h ('k') | ui/app_list/app_list_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698