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 fb3b061ebef8785d33a8e979000d097a1cbf251c..3e55a37ac76154bc030d84ae79bf8defb7ee0caf 100644 |
--- a/ui/app_list/views/app_list_view.h |
+++ b/ui/app_list/views/app_list_view.h |
@@ -38,7 +38,22 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView, |
explicit AppListView(AppListViewDelegate* delegate); |
~AppListView() override; |
- // Initializes the widget. |
+ // Helper function for Initialize, used when there is a flag. |
vadimt
2017/04/19 00:57:15
We use 'helper' in class names, not method names.
newcomer
2017/04/20 19:59:02
Done.
|
+ void InitializeFullscreenHelper(gfx::NativeView parent, |
sky
2017/04/19 15:18:51
Document what the parameters meant.
newcomer
2017/04/20 19:59:02
Done.
|
+ int initial_apps_page, |
+ const gfx::Rect display_work_area_bounds); |
sky
2017/04/19 15:18:51
const gfx::Rect& here and 53.
newcomer
2017/04/20 19:59:02
Done.
|
+ |
+ // Helper function for Initialize, used when there is no flag. |
+ void InitializeBubbleHelper(gfx::NativeView parent, int initial_apps_page); |
sky
2017/04/19 15:18:51
Why do you need the InitializeHelper functions to
newcomer
2017/04/20 19:59:02
Thanks, I made the helper functions (now no longer
|
+ |
+ // Initializes the widget with a frame or a frameless view depending on |
+ // command line switches. |
+ void Initialize(gfx::NativeView parent, |
+ int initial_apps_page, |
+ const gfx::Rect display_work_area_bounds); |
+ |
+ // Initializes the widget as a bubble. Integrated into Initialize but |
+ // kept around for its usage in app_list_presenter_delegate_mus.cc. |
void InitAsBubble(gfx::NativeView parent, int initial_apps_page); |
void SetBubbleArrow(views::BubbleBorder::Arrow arrow); |
@@ -69,6 +84,7 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView, |
// Overridden from views::View: |
gfx::Size GetPreferredSize() const override; |
void OnPaint(gfx::Canvas* canvas) override; |
+ const char* GetClassName() const override; |
// WidgetDelegate overrides: |
bool ShouldHandleSystemCommands() const override; |
@@ -117,8 +133,8 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDialogDelegateView, |
SpeechView* speech_view_; |
views::View* search_box_focus_host_; // Owned by the views hierarchy. |
- views::Widget* search_box_widget_; // Owned by the app list's widget. |
- SearchBoxView* search_box_view_; // Owned by |search_box_widget_|. |
+ views::Widget* search_box_widget_; // Owned by the app list's widget. |
+ SearchBoxView* search_box_view_; // Owned by |search_box_widget_|. |
// A semi-transparent white overlay that covers the app list while dialogs are |
// open. |