9 files changed, 25 insertions, 25 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 17af4fd..891b4b7 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -46,8 +46,8 @@
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
 #include "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h"
-#include "chrome/browser/ui/gtk/download_in_progress_dialog_gtk.h"
-#include "chrome/browser/ui/gtk/download_shelf_gtk.h"
+#include "chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/download/download_shelf_gtk.h"
 #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
 #include "chrome/browser/ui/gtk/find_bar_gtk.h"
 #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h"
diff --git a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc
index 9363467..387a242 100644
--- a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/download_in_progress_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
diff --git a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.h b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.h
index dd8fdb4..9482487 100644
--- a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.h
+++ b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.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 CHROME_BROWSER_UI_GTK_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_
-#define CHROME_BROWSER_UI_GTK_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_
+#define CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -28,4 +28,4 @@ class DownloadInProgressDialogGtk {
   DISALLOW_COPY_AND_ASSIGN(DownloadInProgressDialogGtk);
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_
diff --git a/chrome/browser/ui/gtk/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index 0622db4..a957edd 100644
--- a/chrome/browser/ui/gtk/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/download_item_gtk.h"
+#include "chrome/browser/ui/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -18,7 +18,7 @@
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/custom_drag.h"
-#include "chrome/browser/ui/gtk/download_shelf_gtk.h"
+#include "chrome/browser/ui/gtk/download/download_shelf_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
diff --git a/chrome/browser/ui/gtk/download_item_gtk.h b/chrome/browser/ui/gtk/download/download_item_gtk.h
index 0b4e1c6..6af9f6c 100644
--- a/chrome/browser/ui/gtk/download_item_gtk.h
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.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 CHROME_BROWSER_UI_GTK_DOWNLOAD_ITEM_GTK_H_
-#define CHROME_BROWSER_UI_GTK_DOWNLOAD_ITEM_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_
+#define CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
@@ -12,13 +12,13 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "ui/base/animation/slide_animation.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
+#include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 class BaseDownloadItemModel;
@@ -235,4 +235,4 @@ class DownloadItemGtk : public DownloadItem::Observer,
   CancelableRequestConsumerT<int, 0> icon_consumer_;
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_ITEM_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_
diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
index 67e651e..d808557 100644
--- a/chrome/browser/ui/gtk/download_shelf_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/download_shelf_gtk.h"
+#include "chrome/browser/ui/gtk/download/download_shelf_gtk.h"
 
 #include <string>
 
@@ -12,7 +12,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
-#include "chrome/browser/ui/gtk/download_item_gtk.h"
+#include "chrome/browser/ui/gtk/download/download_item_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.h b/chrome/browser/ui/gtk/download/download_shelf_gtk.h
index 15aa038..5d0f117 100644
--- a/chrome/browser/ui/gtk/download_shelf_gtk.h
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.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 CHROME_BROWSER_UI_GTK_DOWNLOAD_SHELF_GTK_H_
-#define CHROME_BROWSER_UI_GTK_DOWNLOAD_SHELF_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_
+#define CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
@@ -148,4 +148,4 @@ class DownloadShelfGtk : public DownloadShelf,
   friend class DownloadItemGtk;
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_SHELF_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_SHELF_GTK_H_
diff --git a/chrome/browser/ui/gtk/download_started_animation_gtk.cc b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
index 0b10e7d..0b10e7d 100644
--- a/chrome/browser/ui/gtk/download_started_animation_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_started_animation_gtk.cc
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 60b1799..26c9e2c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2550,13 +2550,13 @@
         'browser/ui/gtk/custom_drag.cc',
         'browser/ui/gtk/custom_drag.h',
         'browser/ui/gtk/dialogs_gtk.cc',
-        'browser/ui/gtk/download_in_progress_dialog_gtk.cc',
-        'browser/ui/gtk/download_in_progress_dialog_gtk.h',
-        'browser/ui/gtk/download_item_gtk.cc',
-        'browser/ui/gtk/download_item_gtk.h',
-        'browser/ui/gtk/download_shelf_gtk.cc',
-        'browser/ui/gtk/download_shelf_gtk.h',
-        'browser/ui/gtk/download_started_animation_gtk.cc',
+        'browser/ui/gtk/download/download_in_progress_dialog_gtk.cc',
+        'browser/ui/gtk/download/download_in_progress_dialog_gtk.h',
+        'browser/ui/gtk/download/download_item_gtk.cc',
+        'browser/ui/gtk/download/download_item_gtk.h',
+        'browser/ui/gtk/download/download_shelf_gtk.cc',
+        'browser/ui/gtk/download/download_shelf_gtk.h',
+        'browser/ui/gtk/download/download_started_animation_gtk.cc',
         'browser/ui/gtk/edit_search_engine_dialog.cc',
         'browser/ui/gtk/edit_search_engine_dialog.h',
         'browser/ui/gtk/extensions/extension_install_dialog_gtk.cc',
@@ -3759,7 +3759,7 @@
                 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'],
                 ['include', '^browser/ui/gtk/constrained_window_gtk.h'],
                 ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'],
-                ['include', '^browser/ui/gtk/download_started_animation_gtk.cc'],
+                ['include', '^browser/ui/gtk/download/download_started_animation_gtk.cc'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
                 ['include', '^browser/ui/gtk/first_run_dialog.cc'],