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

Side by Side Diff: ui/app_list/views/app_list_view.h

Issue 719203003: Parent the AppInfoDialog using a ModalDialogHost Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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 UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
11 #include "ui/app_list/app_list_export.h" 11 #include "ui/app_list/app_list_export.h"
12 #include "ui/app_list/app_list_view_delegate_observer.h" 12 #include "ui/app_list/app_list_view_delegate_observer.h"
13 #include "ui/app_list/speech_ui_model_observer.h" 13 #include "ui/app_list/speech_ui_model_observer.h"
14 #include "ui/views/bubble/bubble_delegate.h" 14 #include "ui/views/bubble/bubble_delegate.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 16
17 namespace base { 17 namespace base {
18 class FilePath; 18 class FilePath;
19 } 19 }
20 20
21 namespace test { 21 namespace test {
22 class AppListViewTestApi; 22 class AppListViewTestApi;
23 } 23 }
24 24
25 namespace views { 25 namespace views {
26 class ImageView; 26 class ImageView;
27 } 27 }
28 28
29 namespace web_modal {
30 class ModalDialogHost;
31 }
32
29 namespace app_list { 33 namespace app_list {
30 class ApplicationDragAndDropHost; 34 class ApplicationDragAndDropHost;
31 class AppListMainView; 35 class AppListMainView;
32 class AppListModel; 36 class AppListModel;
33 class AppListViewDelegate; 37 class AppListViewDelegate;
34 class AppListViewObserver; 38 class AppListViewObserver;
35 class HideViewAnimationObserver; 39 class HideViewAnimationObserver;
36 class PaginationModel; 40 class PaginationModel;
37 class SearchBoxView; 41 class SearchBoxView;
38 class SpeechView; 42 class SpeechView;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 118
115 #if defined(OS_WIN) 119 #if defined(OS_WIN)
116 HWND GetHWND() const; 120 HWND GetHWND() const;
117 #endif 121 #endif
118 122
119 AppListMainView* app_list_main_view() { return app_list_main_view_; } 123 AppListMainView* app_list_main_view() { return app_list_main_view_; }
120 124
121 // Gets the PaginationModel owned by this view's apps grid. 125 // Gets the PaginationModel owned by this view's apps grid.
122 PaginationModel* GetAppsPaginationModel(); 126 PaginationModel* GetAppsPaginationModel();
123 127
128 web_modal::ModalDialogHost* GetDialogHost();
129
124 private: 130 private:
125 friend class ::test::AppListViewTestApi; 131 friend class ::test::AppListViewTestApi;
126 132
127 void InitAsBubbleInternal(gfx::NativeView parent, 133 void InitAsBubbleInternal(gfx::NativeView parent,
128 int initial_apps_page, 134 int initial_apps_page,
129 views::BubbleBorder::Arrow arrow, 135 views::BubbleBorder::Arrow arrow,
130 bool border_accepts_events, 136 bool border_accepts_events,
131 const gfx::Vector2d& anchor_offset); 137 const gfx::Vector2d& anchor_offset);
132 138
133 // Overridden from views::BubbleDelegateView: 139 // Overridden from views::BubbleDelegateView:
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 178
173 // For UMA and testing. If non-null, triggered when the app list is painted. 179 // For UMA and testing. If non-null, triggered when the app list is painted.
174 base::Closure next_paint_callback_; 180 base::Closure next_paint_callback_;
175 181
176 DISALLOW_COPY_AND_ASSIGN(AppListView); 182 DISALLOW_COPY_AND_ASSIGN(AppListView);
177 }; 183 };
178 184
179 } // namespace app_list 185 } // namespace app_list
180 186
181 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 187 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698