| Index: ui/app_list/views/app_list_view.h
|
| diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h
|
| index 1499ce1eaf6a64622b65a2d0ba407516518efbc1..b0f834139d5bd967e8d24dfc641b7f463ce312a9 100644
|
| --- a/ui/app_list/views/app_list_view.h
|
| +++ b/ui/app_list/views/app_list_view.h
|
| @@ -21,10 +21,6 @@ namespace base {
|
| class FilePath;
|
| }
|
|
|
| -namespace test {
|
| -class AppListViewTestApi;
|
| -}
|
| -
|
| namespace views {
|
| class ImageView;
|
| }
|
| @@ -40,6 +36,10 @@ class PaginationModel;
|
| class SearchBoxView;
|
| class SpeechView;
|
|
|
| +namespace test {
|
| +class AppListViewTestApi;
|
| +}
|
| +
|
| // AppListView is the top-level view and controller of app list UI. It creates
|
| // and hosts a AppsGridView and passes AppListModel to it for display.
|
| class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView,
|
| @@ -103,7 +103,6 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView,
|
| // Overridden from views::View:
|
| gfx::Size GetPreferredSize() const override;
|
| void OnPaint(gfx::Canvas* canvas) override;
|
| - void OnThemeChanged() override;
|
|
|
| // WidgetDelegate overrides:
|
| bool ShouldHandleSystemCommands() const override;
|
| @@ -115,20 +114,11 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView,
|
| void OnProfilesChanged() override;
|
| void OnShutdown() override;
|
|
|
| - void Prerender();
|
| -
|
| void SetProfileByPath(const base::FilePath& profile_path);
|
|
|
| void AddObserver(AppListViewObserver* observer);
|
| void RemoveObserver(AppListViewObserver* observer);
|
|
|
| - // Set a callback to be called the next time any app list paints.
|
| - void SetNextPaintCallback(const base::Closure& callback);
|
| -
|
| -#if defined(OS_WIN)
|
| - HWND GetHWND() const;
|
| -#endif
|
| -
|
| AppListMainView* app_list_main_view() { return app_list_main_view_; }
|
|
|
| // Gets the PaginationModel owned by this view's apps grid.
|
| @@ -140,7 +130,7 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView,
|
| void SchedulePaintInRect(const gfx::Rect& rect) override;
|
|
|
| private:
|
| - friend class ::test::AppListViewTestApi;
|
| + friend class test::AppListViewTestApi;
|
|
|
| void InitContents(gfx::NativeView parent, int initial_apps_page);
|
|
|
|
|