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

Side by Side Diff: ash/app_list/app_list_presenter_delegate.h

Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix control reaches end of non-void function warnings Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_ 5 #ifndef ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_
6 #define ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_ 6 #define ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/common/shelf/shelf_icon_observer.h"
11 #include "ash/common/shell_observer.h" 12 #include "ash/common/shell_observer.h"
12 #include "ash/shelf/shelf_icon_observer.h"
13 #include "base/compiler_specific.h"
14 #include "base/macros.h" 13 #include "base/macros.h"
15 #include "ui/app_list/presenter/app_list_presenter_delegate.h" 14 #include "ui/app_list/presenter/app_list_presenter_delegate.h"
16 #include "ui/events/event_handler.h" 15 #include "ui/events/event_handler.h"
17 #include "ui/keyboard/keyboard_controller_observer.h" 16 #include "ui/keyboard/keyboard_controller_observer.h"
18 17
19 namespace app_list { 18 namespace app_list {
20 class ApplicationDragAndDropHost; 19 class ApplicationDragAndDropHost;
21 class AppListPresenter; 20 class AppListPresenter;
22 class AppListView; 21 class AppListView;
23 class AppListViewDelegateFactory; 22 class AppListViewDelegateFactory;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 92
94 // Owned by its widget. 93 // Owned by its widget.
95 app_list::AppListView* view_ = nullptr; 94 app_list::AppListView* view_ = nullptr;
96 95
97 DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegate); 96 DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegate);
98 }; 97 };
99 98
100 } // namespace ash 99 } // namespace ash
101 100
102 #endif // ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_ 101 #endif // ASH_APP_LIST_APP_LIST_PRESENTER_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698