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

Unified Diff: ash/shelf/shelf_widget.h

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.h
diff --git a/ash/common/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
similarity index 93%
rename from ash/common/shelf/shelf_widget.h
rename to ash/shelf/shelf_widget.h
index e77b9d8cc17341c9875788623da6968523edf49e..0b9097cccf47199ab82189f78897c7bd481cb4d1 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_
-#define ASH_COMMON_SHELF_SHELF_WIDGET_H_
+#ifndef ASH_SHELF_SHELF_WIDGET_H_
+#define ASH_SHELF_SHELF_WIDGET_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/common/shelf/shelf_background_animator.h"
-#include "ash/common/shelf/shelf_background_animator_observer.h"
-#include "ash/common/shelf/shelf_layout_manager_observer.h"
#include "ash/public/cpp/shelf_types.h"
+#include "ash/shelf/shelf_background_animator.h"
+#include "ash/shelf/shelf_background_animator_observer.h"
+#include "ash/shelf/shelf_layout_manager_observer.h"
#include "base/macros.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_observer.h"
@@ -127,4 +127,4 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
} // namespace ash
-#endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_
+#endif // ASH_SHELF_SHELF_WIDGET_H_
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698