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

Unified Diff: ash/shelf/shelf_window_targeter.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup 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: ash/shelf/shelf_window_targeter.h
diff --git a/ash/shelf/shelf_window_targeter.h b/ash/shelf/shelf_window_targeter.h
index d8c586730e123eef507ed61c78d5a23c28a2d170..b1f090dc90086a4a2fe27c3a2a8a9af2e45e9151 100644
--- a/ash/shelf/shelf_window_targeter.h
+++ b/ash/shelf/shelf_window_targeter.h
@@ -5,14 +5,14 @@
#ifndef ASH_SHELF_SHELF_WINDOW_TARGETER_H_
#define ASH_SHELF_SHELF_WINDOW_TARGETER_H_
-#include "ash/shelf/wm_shelf_observer.h"
+#include "ash/shelf/shelf_observer.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/wm/core/easy_resize_window_targeter.h"
namespace ash {
-class WmShelf;
+class Shelf;
class WmWindow;
// ShelfWindowTargeter makes it easier to resize windows with the mouse when the
@@ -20,19 +20,19 @@ class WmWindow;
// easier to drag the shelf out with touch while it is hidden.
class ShelfWindowTargeter : public ::wm::EasyResizeWindowTargeter,
public aura::WindowObserver,
- public WmShelfObserver {
+ public ShelfObserver {
public:
- ShelfWindowTargeter(WmWindow* container, WmShelf* shelf);
+ ShelfWindowTargeter(WmWindow* container, Shelf* shelf);
~ShelfWindowTargeter() override;
private:
// aura::WindowObserver:
void OnWindowDestroying(aura::Window* window) override;
- // WmShelfObserver:
+ // ShelfObserver:
void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
- WmShelf* shelf_;
+ Shelf* shelf_;
DISALLOW_COPY_AND_ASSIGN(ShelfWindowTargeter);
};

Powered by Google App Engine
This is Rietveld 408576698