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

Unified Diff: ui/app_list/views/apps_container_view.h

Issue 2341113003: Remove deprecation warning banner from App Launcher code. (Closed)
Patch Set: Created 4 years, 3 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/views/app_list_view_unittest.cc ('k') | ui/app_list/views/apps_container_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/apps_container_view.h
diff --git a/ui/app_list/views/apps_container_view.h b/ui/app_list/views/apps_container_view.h
index 6fca60f067778fcbf8d62dc16075d3b7c69a6f14..792158a30dc027deab8372a72475212997a62274 100644
--- a/ui/app_list/views/apps_container_view.h
+++ b/ui/app_list/views/apps_container_view.h
@@ -13,8 +13,6 @@
#include "ui/app_list/app_list_folder_item.h"
#include "ui/app_list/views/app_list_page.h"
#include "ui/app_list/views/top_icon_animation_view.h"
-#include "ui/gfx/range/range.h"
-#include "ui/views/controls/styled_label_listener.h"
namespace gfx {
class Rect;
@@ -28,16 +26,13 @@ class AppListFolderItem;
class AppListFolderView;
class AppListMainView;
class AppListModel;
-class AppListViewDelegate;
class ContentsView;
class FolderBackgroundView;
// AppsContainerView contains a root level AppsGridView to render the root level
// app items, and a AppListFolderView to render the app items inside the
// active folder. Only one if them is visible to user at any time.
-class AppsContainerView : public AppListPage,
- public TopIconAnimationObserver,
- public views::StyledLabelListener {
+class AppsContainerView : public AppListPage, public TopIconAnimationObserver {
public:
AppsContainerView(AppListMainView* app_list_main_view,
AppListModel* model);
@@ -83,11 +78,6 @@ class AppsContainerView : public AppListPage,
// TopIconAnimationObserver overrides:
void OnTopIconAnimationsComplete() override;
- // StyledLabelListener overrides:
- void StyledLabelLinkClicked(views::StyledLabel* label,
- const gfx::Range& range,
- int event_flags) override;
-
AppsGridView* apps_grid_view() { return apps_grid_view_; }
FolderBackgroundView* folder_background_view() {
return folder_background_view_;
@@ -117,13 +107,10 @@ class AppsContainerView : public AppListPage,
void PrepareToShowApps(AppListFolderItem* folder_item);
- // Null on Chrome OS (unused).
- View* deprecation_banner_view_ = nullptr; // Owned by views hierarchy.
AppsGridView* apps_grid_view_; // Owned by views hierarchy.
AppListFolderView* app_list_folder_view_; // Owned by views hierarchy.
FolderBackgroundView* folder_background_view_; // Owned by views hierarchy.
ShowState show_state_;
- AppListViewDelegate* view_delegate_;
// The transitional views for animating the top items in folder
// when opening or closing a folder.
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/apps_container_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698