diff options
| author | mfomitchev <mfomitchev@chromium.org> | 2016-03-22 12:40:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 19:42:38 +0000 |
| commit | 01551e6e8af56878f79006b829aff10572af2fe1 (patch) | |
| tree | 6d363fa1dc675df68cad27433cd9332a1cc7d7b2 /ash | |
| parent | 571d9ef9a6b91d606dcf00d493b22f32f96ffa45 (diff) | |
| download | chromium_src-01551e6e8af56878f79006b829aff10572af2fe1.zip chromium_src-01551e6e8af56878f79006b829aff10572af2fe1.tar.gz chromium_src-01551e6e8af56878f79006b829aff10572af2fe1.tar.bz2 | |
Minor changes around GetAppListWindow and GetAppListView.
- Stop using Shell::GetAppListWindow() from the Ash code. (This is in
preparation for limiting the AppListController API that Ash uses).
- Clarify the comment for Shell::GetAppListView().
BUG=NONE
Review URL: https://codereview.chromium.org/1759133003
Cr-Commit-Position: refs/heads/master@{#382646}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shelf/shelf_view.cc | 2 | ||||
| -rw-r--r-- | ash/shelf/shelf_view_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/shell.h | 2 | ||||
| -rw-r--r-- | ash/wm/app_list_controller.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index e61e7aa..b3ddf68 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -1906,7 +1906,7 @@ const ShelfItem* ShelfView::ShelfItemForView(const views::View* view) const { bool ShelfView::ShouldShowTooltipForView(const views::View* view) const { if (view == GetAppListButtonView() && - Shell::GetInstance()->GetAppListWindow()) + Shell::GetInstance()->GetAppListTargetVisibility()) return false; const ShelfItem* item = ShelfItemForView(view); if (!item) diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index 994e146..71e5e7f 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc @@ -1517,7 +1517,7 @@ TEST_F(ShelfViewTest, ShouldHideTooltipTest) { TEST_F(ShelfViewTest, ShouldHideTooltipWithAppListWindowTest) { Shell::GetInstance()->ShowAppList(NULL); - ASSERT_TRUE(Shell::GetInstance()->GetAppListWindow()); + ASSERT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); // The tooltip shouldn't hide if the mouse is on normal buttons. for (int i = 1; i < test_api_->GetButtonCount(); i++) { diff --git a/ash/shell.h b/ash/shell.h index fbd85b8..d929dba 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -250,7 +250,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, // Returns app list window or NULL if it is not visible. aura::Window* GetAppListWindow(); - // Returns app list view or NULL if it is not visible. + // Returns app list view if one exists, or NULL otherwise. app_list::AppListView* GetAppListView(); // Returns true if a system-modal dialog window is currently open. diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h index 3364b11..1f3114c 100644 --- a/ash/wm/app_list_controller.h +++ b/ash/wm/app_list_controller.h @@ -65,7 +65,7 @@ class AppListController : public ui::EventHandler, // Returns app list window or NULL if it is not visible. aura::Window* GetWindow(); - // Returns app list view or NULL if it is not visible. + // Returns app list view if one exists, or NULL otherwise. app_list::AppListView* GetView() { return view_; } private: |