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

Unified Diff: chrome/browser/chromeos/first_run/steps/tray_step.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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
Index: chrome/browser/chromeos/first_run/steps/tray_step.cc
diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.cc b/chrome/browser/chromeos/first_run/steps/tray_step.cc
index 62cd80dfbe8a2fd4856f2860940ab48ba3ddd4e5..67002116488263b9913ca0f1fd3a2070f06e30bc 100644
--- a/chrome/browser/chromeos/first_run/steps/tray_step.cc
+++ b/chrome/browser/chromeos/first_run/steps/tray_step.cc
@@ -6,7 +6,7 @@
#include "ash/first_run/first_run_helper.h"
#include "ash/shelf/wm_shelf.h"
-#include "ash/shell_port.h"
+#include "ash/shell.h"
#include "base/i18n/rtl.h"
#include "chrome/browser/chromeos/first_run/step_names.h"
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"
@@ -29,8 +29,7 @@ void TrayStep::DoShow() {
FirstRunActor::StepPosition position;
position.SetTop(bounds.y());
ash::ShelfAlignment alignment =
- ash::WmShelf::ForWindow(ash::ShellPort::Get()->GetPrimaryRootWindow())
- ->alignment();
+ ash::WmShelf::ForWindow(ash::Shell::GetPrimaryRootWindow())->alignment();
if ((!base::i18n::IsRTL() && alignment != ash::SHELF_ALIGNMENT_LEFT) ||
alignment == ash::SHELF_ALIGNMENT_RIGHT)
position.SetRight(GetOverlaySize().width() - bounds.x());
« no previous file with comments | « chrome/browser/chromeos/accessibility/chromevox_panel.cc ('k') | chrome/browser/chromeos/login/login_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698