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

Unified Diff: ash/shelf/shelf_view.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_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.h
diff --git a/ash/common/shelf/shelf_view.h b/ash/shelf/shelf_view.h
similarity index 97%
rename from ash/common/shelf/shelf_view.h
rename to ash/shelf/shelf_view.h
index 3f1858b5cdba4a162882e9eafa8b03466589b55e..1355fc770d3a68f235bf5af16f0fee5116c08231 100644
--- a/ash/common/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -2,19 +2,19 @@
// 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_VIEW_H_
-#define ASH_COMMON_SHELF_SHELF_VIEW_H_
+#ifndef ASH_SHELF_SHELF_VIEW_H_
+#define ASH_SHELF_SHELF_VIEW_H_
#include <memory>
#include <string>
#include <utility>
#include <vector>
-#include "ash/common/shelf/ink_drop_button_listener.h"
-#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
-#include "ash/common/shelf/shelf_item_delegate.h"
-#include "ash/common/shelf/shelf_model_observer.h"
-#include "ash/common/shelf/shelf_tooltip_manager.h"
+#include "ash/shelf/ink_drop_button_listener.h"
+#include "ash/shelf/shelf_button_pressed_metric_tracker.h"
+#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/shelf/shelf_model_observer.h"
+#include "ash/shelf/shelf_tooltip_manager.h"
#include "base/macros.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/app_list/views/app_list_drag_and_drop_host.h"
@@ -467,4 +467,4 @@ class ASH_EXPORT ShelfView : public views::View,
} // namespace ash
-#endif // ASH_COMMON_SHELF_SHELF_VIEW_H_
+#endif // ASH_SHELF_SHELF_VIEW_H_
« no previous file with comments | « ash/shelf/shelf_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698