6 files changed, 19 insertions, 20 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 8070974..246e48e 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -134,10 +134,6 @@
         'keyboard_overlay/keyboard_overlay_delegate.h',
         'keyboard_overlay/keyboard_overlay_view.cc',
         'keyboard_overlay/keyboard_overlay_view.h',
-        'launcher/alternate_app_list_button.cc',
-        'launcher/alternate_app_list_button.h',
-        'launcher/app_list_button.cc',
-        'launcher/app_list_button.h',
         'launcher/launcher.cc',
         'launcher/launcher.h',
         'launcher/launcher_alignment_menu.cc',
@@ -186,6 +182,10 @@
         'screenshot_delegate.h',
         'session_state_delegate.h',
         'session_state_observer.h',
+        'shelf/alternate_app_list_button.cc',
+        'shelf/alternate_app_list_button.h',
+        'shelf/app_list_button.cc',
+        'shelf/app_list_button.h',
         'shelf/background_animator.cc',
         'shelf/background_animator.h',
         'shelf/shelf_bezel_event_filter.cc',
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index eb7cefb..ae7acc5 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -9,8 +9,6 @@
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_image_view.h"
-#include "ash/launcher/alternate_app_list_button.h"
-#include "ash/launcher/app_list_button.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_icon_observer.h"
@@ -21,6 +19,8 @@
 #include "ash/launcher/tabbed_launcher_button.h"
 #include "ash/root_window_controller.h"
 #include "ash/scoped_target_root_window.h"
+#include "ash/shelf/alternate_app_list_button.h"
+#include "ash/shelf/app_list_button.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
diff --git a/ash/launcher/alternate_app_list_button.cc b/ash/shelf/alternate_app_list_button.cc
index 0466c71..7bcb84b 100644
--- a/ash/launcher/alternate_app_list_button.cc
+++ b/ash/shelf/alternate_app_list_button.cc
@@ -1,7 +1,8 @@
 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#include "ash/launcher/alternate_app_list_button.h"
+
+#include "ash/shelf/alternate_app_list_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher_button_host.h"
diff --git a/ash/launcher/alternate_app_list_button.h b/ash/shelf/alternate_app_list_button.h
index f68207c..f38f91b 100644
--- a/ash/launcher/alternate_app_list_button.h
+++ b/ash/shelf/alternate_app_list_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_LAUNCHER_ALTERNATE_APP_LIST_BUTTON_H_
-#define ASH_LAUNCHER_ALTERNATE_APP_LIST_BUTTON_H_
+#ifndef ASH_SHELF_ALTERNATE_APP_LIST_BUTTON_H_
+#define ASH_SHELF_ALTERNATE_APP_LIST_BUTTON_H_
 
 #include "ui/views/controls/button/image_button.h"
 
@@ -15,8 +15,6 @@ namespace internal {
 
 class LauncherButtonHost;
 
-
-
 // Button used for the AppList icon on the launcher.
 // This class is an alternate implementation to
 // ash::internal::AppListButton for the purposes of testing an
@@ -32,7 +30,7 @@ class AlternateAppListButton : public views::ImageButton {
   virtual ~AlternateAppListButton();
 
  protected:
-  // View overrides:
+  // views::ImageButton:
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
@@ -55,4 +53,4 @@ class AlternateAppListButton : public views::ImageButton {
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_LAUNCHER_ALTERNATE_APP_LIST_BUTTON_H_
+#endif  // ASH_SHELF_ALTERNATE_APP_LIST_BUTTON_H_
diff --git a/ash/launcher/app_list_button.cc b/ash/shelf/app_list_button.cc
index 8879a38..ca47d06 100644
--- a/ash/launcher/app_list_button.cc
+++ b/ash/shelf/app_list_button.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/launcher/app_list_button.h"
+#include "ash/shelf/app_list_button.h"
 
 #include <vector>
 
diff --git a/ash/launcher/app_list_button.h b/ash/shelf/app_list_button.h
index 4d25254..a8c8e70 100644
--- a/ash/launcher/app_list_button.h
+++ b/ash/shelf/app_list_button.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_LAUNCHER_APP_LIST_BUTTON_H_
-#define ASH_LAUNCHER_APP_LIST_BUTTON_H_
+#ifndef ASH_SHELF_APP_LIST_BUTTON_H_
+#define ASH_SHELF_APP_LIST_BUTTON_H_
 
 #include "ui/views/controls/button/image_button.h"
 
@@ -23,7 +23,7 @@ class AppListButton : public views::ImageButton {
   void StopLoadingAnimation();
 
  protected:
-  // View overrides:
+  // views::ImageButton:
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
@@ -42,4 +42,4 @@ class AppListButton : public views::ImageButton {
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_LAUNCHER_APP_LIST_BUTTON_H_
+#endif  // ASH_SHELF_APP_LIST_BUTTON_H_