Commit 290d0a12 authored by Qiang Xu's avatar Qiang Xu Committed by Commit Bot

app_list: remove AppsGridViewDelegate

changes:
after go/croscl/564485, AppsGridViewDelegate is no longer needed, remove
it in this CL.

Bug: 735702
TEST: still compiles
Change-Id: I8aca563c6951283157121981bebd53b39d5ab05e
Reviewed-on: https://chromium-review.googlesource.com/571058Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Qiang(Joe) Xu <warx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486582}
parent d558a3f4
......@@ -119,7 +119,6 @@ component("app_list") {
"views/apps_container_view.h",
"views/apps_grid_view.cc",
"views/apps_grid_view.h",
"views/apps_grid_view_delegate.h",
"views/apps_grid_view_folder_delegate.h",
"views/contents_view.cc",
"views/contents_view.h",
......
......@@ -12,7 +12,6 @@
#include "base/timer/timer.h"
#include "ui/app_list/app_list_export.h"
#include "ui/app_list/app_list_model_observer.h"
#include "ui/app_list/views/apps_grid_view_delegate.h"
#include "ui/app_list/views/search_box_view_delegate.h"
#include "ui/app_list/views/search_result_list_view_delegate.h"
#include "ui/views/view.h"
......@@ -31,7 +30,6 @@ class SearchBoxView;
// AppListMainView contains the normal view of the app list, which is shown
// when the user is signed in.
class APP_LIST_EXPORT AppListMainView : public views::View,
public AppsGridViewDelegate,
public AppListModelObserver,
public SearchBoxViewDelegate,
public SearchResultListViewDelegate {
......@@ -75,9 +73,14 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
void OnCustomLauncherPageEnabledStateChanged(bool enabled) override;
void OnSearchEngineIsGoogleChanged(bool is_google) override;
// Overridden from AppsGridViewDelegate:
void ActivateApp(AppListItem* item, int event_flags) override;
void CancelDragInActiveFolder() override;
// Invoked when an item is activated on the grid view. |event_flags| contains
// the flags of the keyboard/mouse event that triggers the activation request.
void ActivateApp(AppListItem* item, int event_flags);
// Called by the root grid view to cancel a drag that started inside a folder.
// This can occur when the root grid is visible for a reparent and its model
// changes, necessitating a cancel of the drag operation.
void CancelDragInActiveFolder();
private:
// Adds the ContentsView.
......
......@@ -22,7 +22,6 @@
#include "ui/app_list/views/app_list_folder_view.h"
#include "ui/app_list/views/app_list_item_view.h"
#include "ui/app_list/views/app_list_main_view.h"
#include "ui/app_list/views/apps_grid_view_delegate.h"
#include "ui/app_list/views/contents_view.h"
#include "ui/app_list/views/indicator_chip_view.h"
#include "ui/app_list/views/page_switcher_horizontal.h"
......
// Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef UI_APP_LIST_VIEWS_APPS_GRID_VIEW_DELEGATE_H_
#define UI_APP_LIST_VIEWS_APPS_GRID_VIEW_DELEGATE_H_
#include <string>
#include "base/callback_forward.h"
#include "ui/app_list/app_list_export.h"
namespace app_list {
class AppListItem;
class APP_LIST_EXPORT AppsGridViewDelegate {
public:
// Invoked when an item is activated on the grid view. |event_flags| contains
// the flags of the keyboard/mouse event that triggers the activation request.
virtual void ActivateApp(AppListItem* item, int event_flags) = 0;
// Called by the root grid view to cancel a drag that started inside a folder.
// This can occur when the root grid is visible for a reparent and its model
// changes, necessitating a cancel of the drag operation.
virtual void CancelDragInActiveFolder() = 0;
protected:
virtual ~AppsGridViewDelegate() {}
};
} // namespace app_list
#endif // UI_APP_LIST_VIEWS_APPS_GRID_VIEW_DELEGATE_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment