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

Unified Diff: ash/first_run/first_run_helper_impl.cc

Issue 2288993002: ash: Move AppList support to ShelfWidget, expose ShelfWidget in WmShelf (Closed)
Patch Set: missed one unit test 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/wm_shelf.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/first_run/first_run_helper_impl.cc
diff --git a/ash/first_run/first_run_helper_impl.cc b/ash/first_run/first_run_helper_impl.cc
index 71b1e6cab9f1d3606b8574165597c593f9bf8eb7..2116d073c415ccc087784cf58191c31d5f41039d 100644
--- a/ash/first_run/first_run_helper_impl.cc
+++ b/ash/first_run/first_run_helper_impl.cc
@@ -5,9 +5,13 @@
#include "ash/first_run/first_run_helper_impl.h"
#include "ash/common/shelf/app_list_button.h"
-#include "ash/common/shelf/shelf.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/system/tray/system_tray.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "base/logging.h"
#include "ui/app_list/views/app_list_view.h"
@@ -53,8 +57,11 @@ views::Widget* FirstRunHelperImpl::GetOverlayWidget() {
}
gfx::Rect FirstRunHelperImpl::GetAppListButtonBounds() {
- Shelf* shelf = Shelf::ForPrimaryDisplay();
- AppListButton* app_button = shelf->GetAppListButton();
+ WmShelf* shelf = WmShell::Get()
+ ->GetPrimaryRootWindow()
+ ->GetRootWindowController()
+ ->GetShelf();
+ AppListButton* app_button = shelf->shelf_widget()->GetAppListButton();
return app_button->GetBoundsInScreen();
}
« no previous file with comments | « ash/common/shelf/wm_shelf.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698