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

Unified Diff: ash/shelf/shelf_view.cc

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.h ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.cc
diff --git a/ash/common/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
similarity index 98%
rename from ash/common/shelf/shelf_view.cc
rename to ash/shelf/shelf_view.cc
index c46b168b96fe3cc818aa5e87dc511376a85e2528..1a194f24232a1c366af0c139a1a2cad2ab5b35d8 100644
--- a/ash/common/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -2,30 +2,30 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/common/shelf/shelf_view.h"
+#include "ash/shelf/shelf_view.h"
#include <algorithm>
#include <memory>
-#include "ash/common/ash_constants.h"
-#include "ash/common/drag_drop/drag_image_view.h"
-#include "ash/common/scoped_root_window_for_new_windows.h"
-#include "ash/common/shelf/app_list_button.h"
-#include "ash/common/shelf/overflow_bubble.h"
-#include "ash/common/shelf/overflow_bubble_view.h"
-#include "ash/common/shelf/overflow_button.h"
-#include "ash/common/shelf/shelf_application_menu_model.h"
-#include "ash/common/shelf/shelf_button.h"
-#include "ash/common/shelf/shelf_constants.h"
-#include "ash/common/shelf/shelf_delegate.h"
-#include "ash/common/shelf/shelf_model.h"
-#include "ash/common/shelf/shelf_widget.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/shell_delegate.h"
-#include "ash/common/wm/root_window_finder.h"
-#include "ash/common/wm_shell.h"
-#include "ash/common/wm_window.h"
+#include "ash/ash_constants.h"
+#include "ash/drag_drop/drag_image_view.h"
+#include "ash/scoped_root_window_for_new_windows.h"
+#include "ash/shelf/app_list_button.h"
+#include "ash/shelf/overflow_bubble.h"
+#include "ash/shelf/overflow_bubble_view.h"
+#include "ash/shelf/overflow_button.h"
+#include "ash/shelf/shelf_application_menu_model.h"
+#include "ash/shelf/shelf_button.h"
+#include "ash/shelf/shelf_constants.h"
+#include "ash/shelf/shelf_delegate.h"
+#include "ash/shelf/shelf_model.h"
+#include "ash/shelf/shelf_widget.h"
+#include "ash/shelf/wm_shelf.h"
+#include "ash/shell_delegate.h"
#include "ash/strings/grit/ash_strings.h"
+#include "ash/wm/root_window_finder.h"
+#include "ash/wm_shell.h"
+#include "ash/wm_window.h"
#include "base/auto_reset.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
« no previous file with comments | « ash/shelf/shelf_view.h ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698