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

Unified Diff: chrome/browser/chromeos/accessibility/chromevox_panel.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase 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/accessibility/chromevox_panel.cc
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
index dee0d4a29402a6a73ec8ac3c35bbb6ef9969eddb..827273d77853d738d2b1faeedb6ba2c45cb17ba9 100644
--- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc
+++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
@@ -7,8 +7,8 @@
#include "ash/accessibility_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/wm_window.h"
#include "base/macros.h"
@@ -202,7 +202,7 @@ void ChromeVoxPanel::UpdateWidgetBounds() {
void ChromeVoxPanel::SendPanelHeightToAsh(int panel_height) {
// TODO(mash): Replace with shelf mojo API.
- ash::WmShelf* shelf = ash::WmShelf::ForWindow(GetRootWindow());
+ ash::Shelf* shelf = ash::Shelf::ForWindow(GetRootWindow());
ash::ShelfLayoutManager* shelf_layout_manager =
shelf ? shelf->shelf_layout_manager() : nullptr;
if (shelf_layout_manager)
« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_manager.cc ('k') | chrome/browser/chromeos/first_run/steps/tray_step.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698