Update references part 2: files in chrome/browser/ui/

Update chrome/browser/gtk references & copyright dates of touched files. Re-alphabetize include lists as necessary from this change. Update header guard & add EOF newline in chrome/browser/ui/view_ids.h Split C/C++ system headers into blocks in: chrome/browser/ui/gtk/gtk_expanded_container.cc chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc Sync manually with r71749 BUG=69289 TEST=none Review URL: http://codereview.chromium.org/6296012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71816 0039d316-1c4b-4281-b951-d872f2087c98
author: msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-01-19 18:35:50 +0000
committer: msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2011-01-19 18:35:50 +0000
commit: 0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2 (patch)
tree: 192f05ac1fc2375ca4a49cea093f5b8e18b5546d /chrome
parent: 757924a0ae4647cc48c1df1f097243d588ae09f5 (diff)
download: chromium_src-0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2.zip
chromium_src-0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2.tar.gz
chromium_src-0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2.tar.bz2
141 files changed, 384 insertions, 381 deletions
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index cc3ba35..6d5b499 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -73,7 +73,7 @@
 #endif
 
 #if defined(TOOLKIT_GTK)
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index 2bdaaa3..5b2f1c9 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -25,7 +25,7 @@
 #include "chrome/browser/ui/views/find_bar_host.h"
 #include "views/focus/focus_manager.h"
 #elif defined(TOOLKIT_GTK)
-#include "chrome/browser/gtk/slide_animator_gtk.h"
+#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #endif
diff --git a/chrome/browser/ui/gtk/about_chrome_dialog.cc b/chrome/browser/ui/gtk/about_chrome_dialog.cc
index e756328..e610a95 100644
--- a/chrome/browser/ui/gtk/about_chrome_dialog.cc
+++ b/chrome/browser/ui/gtk/about_chrome_dialog.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/gtk/about_chrome_dialog.h"
+#include "chrome/browser/ui/gtk/about_chrome_dialog.h"
 
 #include <gtk/gtk.h>
 
@@ -14,12 +14,12 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc
index a53eeab..fbec557 100644
--- a/chrome/browser/ui/gtk/accelerators_gtk.cc
+++ b/chrome/browser/ui/gtk/accelerators_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/gtk/accelerators_gtk.h"
+#include "chrome/browser/ui/gtk/accelerators_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/chrome/browser/ui/gtk/accessibility_event_router_gtk.cc b/chrome/browser/ui/gtk/accessibility_event_router_gtk.cc
index 534e74d..04061c6 100644
--- a/chrome/browser/ui/gtk/accessibility_event_router_gtk.cc
+++ b/chrome/browser/ui/gtk/accessibility_event_router_gtk.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/accessibility_event_router_gtk.h"
+#include "chrome/browser/ui/gtk/accessibility_event_router_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/common/notification_type.h"
 
 #if defined(TOOLKIT_VIEWS)
-#include "views/controls/textfield/gtk_views_textview.h"
 #include "views/controls/textfield/gtk_views_entry.h"
+#include "views/controls/textfield/gtk_views_textview.h"
 #include "views/controls/textfield/native_textfield_gtk.h"
 #endif
 
diff --git a/chrome/browser/ui/gtk/accessibility_event_router_gtk_unittest.cc b/chrome/browser/ui/gtk/accessibility_event_router_gtk_unittest.cc
index 424a8c2..3b99980 100644
--- a/chrome/browser/ui/gtk/accessibility_event_router_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/accessibility_event_router_gtk_unittest.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/gtk/accessibility_event_router_gtk.h"
+#include "chrome/browser/ui/gtk/accessibility_event_router_gtk.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/ui/gtk/accessible_widget_helper_gtk.cc b/chrome/browser/ui/gtk/accessible_widget_helper_gtk.cc
index 5cefe36..b25203f 100644
--- a/chrome/browser/ui/gtk/accessible_widget_helper_gtk.cc
+++ b/chrome/browser/ui/gtk/accessible_widget_helper_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/gtk/accessible_widget_helper_gtk.h"
+#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/accessibility_events.h"
diff --git a/chrome/browser/ui/gtk/accessible_widget_helper_gtk.h b/chrome/browser/ui/gtk/accessible_widget_helper_gtk.h
index 65cbe70..6cff59c 100644
--- a/chrome/browser/ui/gtk/accessible_widget_helper_gtk.h
+++ b/chrome/browser/ui/gtk/accessible_widget_helper_gtk.h
@@ -14,7 +14,7 @@
 #include "base/basictypes.h"
 #include "base/singleton.h"
 #include "chrome/browser/accessibility_events.h"
-#include "chrome/browser/gtk/accessibility_event_router_gtk.h"
+#include "chrome/browser/ui/gtk/accessibility_event_router_gtk.h"
 
 class Profile;
 
diff --git a/chrome/browser/ui/gtk/back_forward_button_gtk.cc b/chrome/browser/ui/gtk/back_forward_button_gtk.cc
index 3eb970b..6eed194 100644
--- a/chrome/browser/ui/gtk/back_forward_button_gtk.cc
+++ b/chrome/browser/ui/gtk/back_forward_button_gtk.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/back_forward_button_gtk.h"
+#include "chrome/browser/ui/gtk/back_forward_button_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/gtk/back_forward_button_gtk.h b/chrome/browser/ui/gtk/back_forward_button_gtk.h
index 12ea2df..ed01b16 100644
--- a/chrome/browser/ui/gtk/back_forward_button_gtk.h
+++ b/chrome/browser/ui/gtk/back_forward_button_gtk.h
@@ -9,8 +9,8 @@
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 
 class BackForwardMenuModel;
 class Browser;
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.h b/chrome/browser/ui/gtk/bookmark_bar_gtk.h
index 75ad908..f22464f 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/ui/gtk/bookmark_bar_gtk.h
@@ -15,11 +15,11 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
-#include "chrome/browser/gtk/bookmark_bar_instructions_gtk.h"
-#include "chrome/browser/gtk/menu_bar_helper.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
-#include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.h"
+#include "chrome/browser/ui/gtk/menu_bar_helper.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/point.h"
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc
index 548dbea..3518825 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc
+++ b/chrome/browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc
@@ -5,9 +5,9 @@
 #include <gtk/gtk.h>
 
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/test/test_server.h"
diff --git a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc
index cb93696..921e72c 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/bookmark_bar_instructions_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/observer_list.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_chrome_shrinkable_hbox.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.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_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc
index 64d4d45..3173c79 100644
--- a/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_bubble_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/gtk/bookmark_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -17,12 +17,12 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/bookmark_bubble_gtk.h b/chrome/browser/ui/gtk/bookmark_bubble_gtk.h
index ee5598e..ec4f169 100644
--- a/chrome/browser/ui/gtk/bookmark_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/bookmark_bubble_gtk.h
@@ -20,7 +20,7 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmark_editor_gtk.cc
index 1ade2ff..c857295 100644
--- a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_editor_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/gtk/bookmark_editor_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_editor_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -13,13 +13,13 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/gtk/bookmark_tree_model.h"
-#include "chrome/browser/gtk/bookmark_utils_gtk.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/bookmark_tree_model.h"
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/gtk_util.h"
 #include "gfx/point.h"
 #include "googleurl/src/gurl.h"
@@ -31,7 +31,7 @@
 #if defined(TOOLKIT_VIEWS)
 #include "views/controls/menu/menu_2.h"
 #else
-#include "chrome/browser/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmark_editor_gtk_unittest.cc
index 1c1d36e..c628c69 100644
--- a/chrome/browser/ui/gtk/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmark_editor_gtk_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/gtk/bookmark_editor_gtk.h"
-#include "chrome/browser/gtk/bookmark_tree_model.h"
+#include "chrome/browser/ui/gtk/bookmark_editor_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_tree_model.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc
index c0f7939..6b5b687 100644
--- a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_menu_controller_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/gtk/bookmark_menu_controller_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -12,13 +12,13 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/gtk/bookmark_utils_gtk.h"
-#include "chrome/browser/gtk/gtk_chrome_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "gfx/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h b/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h
index 12b7109..46919cd 100644
--- a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h
+++ b/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h
@@ -14,7 +14,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
diff --git a/chrome/browser/ui/gtk/bookmark_tree_model.cc b/chrome/browser/ui/gtk/bookmark_tree_model.cc
index 409d26c..8904976 100644
--- a/chrome/browser/ui/gtk/bookmark_tree_model.cc
+++ b/chrome/browser/ui/gtk/bookmark_tree_model.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/bookmark_tree_model.h"
+#include "chrome/browser/ui/gtk/bookmark_tree_model.h"
 
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/gtk/bookmark_utils_gtk.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc
index 8486445..15ad4ad 100644
--- a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_utils_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/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
 
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
@@ -11,13 +11,13 @@
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/gtk/gtk_chrome_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/font.h"
 #include "gfx/gtk_util.h"
diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmark_utils_gtk_unittest.cc
index 603a641..a5f0f17 100644
--- a/chrome/browser/ui/gtk/bookmark_utils_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmark_utils_gtk_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "app/gtk_dnd_util.h"
-#include "chrome/browser/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(BookmarkUtilsGtkTest, GetNodesFromSelectionInvalid) {
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index dc5e53f..bc527a4 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_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/gtk/browser_actions_toolbar_gtk.h"
+#include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
 
 #include <algorithm>
 #include <vector>
@@ -13,18 +13,18 @@
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
-#include "chrome/browser/gtk/extension_popup_gtk.h"
-#include "chrome/browser/gtk/gtk_chrome_button.h"
-#include "chrome/browser/gtk/gtk_chrome_shrinkable_hbox.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/hover_controller_gtk.h"
-#include "chrome/browser/gtk/menu_gtk.h"
-#include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
+#include "chrome/browser/ui/gtk/extension_popup_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/hover_controller_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h
index 88b1de8..b61e22b 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h
@@ -14,10 +14,10 @@
 #include "base/linked_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
-#include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/menu_gtk.h"
-#include "chrome/browser/gtk/overflow_button.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/overflow_button.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.h b/chrome/browser/ui/gtk/browser_toolbar_gtk.h
index 9611586..8483398 100644
--- a/chrome/browser/ui/gtk/browser_toolbar_gtk.h
+++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.h
@@ -14,10 +14,10 @@
 #include "app/gtk_signal_registrar.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/command_updater.h"
-#include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/menu_gtk.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/prefs/pref_member.h"
+#include "chrome/browser/ui/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/ui/gtk/browser_window_factory_gtk.cc b/chrome/browser/ui/gtk/browser_window_factory_gtk.cc
index d4dd62d..97d1907 100644
--- a/chrome/browser/ui/gtk/browser_window_factory_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_factory_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/browser_window.h"
 
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/find_bar_gtk.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/find_bar_gtk.h"
 
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   return new BrowserWindowGtk(browser);
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index b14e65b..79f24ae 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -17,9 +17,9 @@
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/gtk/infobar_arrow_model.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
+#include "chrome/browser/ui/gtk/infobar_arrow_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/rect.h"
 
diff --git a/chrome/browser/ui/gtk/cairo_cached_surface.cc b/chrome/browser/ui/gtk/cairo_cached_surface.cc
index e7ea7d0..49ced4b 100644
--- a/chrome/browser/ui/gtk/cairo_cached_surface.cc
+++ b/chrome/browser/ui/gtk/cairo_cached_surface.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/gtk/cairo_cached_surface.h"
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 
 #include <gtk/gtk.h>
 
diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc
index 9ef32d9..b231dc3 100644
--- a/chrome/browser/ui/gtk/certificate_dialogs.cc
+++ b/chrome/browser/ui/gtk/certificate_dialogs.cc
@@ -4,7 +4,7 @@
 
 // TODO(mattm): this isn't gtk specific, it shouldn't be under the gtk dir
 
-#include "chrome/browser/gtk/certificate_dialogs.h"
+#include "chrome/browser/ui/gtk/certificate_dialogs.h"
 
 
 #include <vector>
diff --git a/chrome/browser/ui/gtk/certificate_viewer.cc b/chrome/browser/ui/gtk/certificate_viewer.cc
index 1f92192..550aab0 100644
--- a/chrome/browser/ui/gtk/certificate_viewer.cc
+++ b/chrome/browser/ui/gtk/certificate_viewer.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/gtk/certificate_viewer.h"
+#include "chrome/browser/ui/gtk/certificate_viewer.h"
 
 #include <gtk/gtk.h>
 
@@ -16,8 +16,8 @@
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/certificate_dialogs.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/certificate_dialogs.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "gfx/gtk_util.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/chrome_gtk_frame.cc b/chrome/browser/ui/gtk/chrome_gtk_frame.cc
index e2badee..d649ba70 100644
--- a/chrome/browser/ui/gtk/chrome_gtk_frame.cc
+++ b/chrome/browser/ui/gtk/chrome_gtk_frame.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/gtk/chrome_gtk_frame.h"
+#include "chrome/browser/ui/gtk/chrome_gtk_frame.h"
 
 G_BEGIN_DECLS
 
diff --git a/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc
index 862fd19..5544f589 100644
--- a/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browsing_data_remover.h"
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index 9eb3580..a8ef604 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/collected_cookies_gtk.h"
+#include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "chrome/browser/cookies_tree_model.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/notification_source.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.h b/chrome/browser/ui/gtk/collected_cookies_gtk.h
index 2e55ec1..ce36341 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.h
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.h
@@ -12,8 +12,8 @@
 
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/constrained_window_gtk.h"
-#include "chrome/browser/gtk/gtk_tree.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_tree.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
index ac0184d..a8aa95f 100644
--- a/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_html_delegate_gtk.cc
@@ -6,11 +6,11 @@
 
 #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/gtk/constrained_window_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
 #include "chrome/common/notification_source.h"
 #include "gfx/rect.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc
index 173dd08..0579efc 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h
index d5e768b..a7161ba 100644
--- a/chrome/browser/ui/gtk/constrained_window_gtk.h
+++ b/chrome/browser/ui/gtk/constrained_window_gtk.h
@@ -11,8 +11,8 @@
 #include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 
 class TabContents;
 typedef struct _GdkColor GdkColor;
diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.h b/chrome/browser/ui/gtk/content_setting_bubble_gtk.h
index 654a867..aa5e1a6 100644
--- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.h
@@ -10,7 +10,7 @@
 
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index f13ab00..ab6ffa9 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_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/gtk/create_application_shortcuts_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
@@ -10,10 +10,10 @@
 #include "base/environment.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc
index a6205e9..0138d38 100644
--- a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc
+++ b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc
@@ -14,7 +14,7 @@
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc
index 31d1cf6..a59cc1c 100644
--- a/chrome/browser/ui/gtk/custom_button.cc
+++ b/chrome/browser/ui/gtk/custom_button.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/custom_button.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
-#include "chrome/browser/gtk/gtk_chrome_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
 #include "gfx/skbitmap_operations.h"
diff --git a/chrome/browser/ui/gtk/custom_button.h b/chrome/browser/ui/gtk/custom_button.h
index 8eaefa3..9703ba2 100644
--- a/chrome/browser/ui/gtk/custom_button.h
+++ b/chrome/browser/ui/gtk/custom_button.h
@@ -10,7 +10,7 @@
 
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/rect.h"
diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc
index 42d6c51..ea1aa80 100644
--- a/chrome/browser/ui/gtk/custom_drag.cc
+++ b/chrome/browser/ui/gtk/custom_drag.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/custom_drag.h"
+#include "chrome/browser/ui/gtk/custom_drag.h"
 
 #include "app/gtk_dnd_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
-#include "chrome/browser/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
 #include "gfx/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc
index db151ff..0db12cb 100644
--- a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/download_in_progress_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/download_in_progress_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
-#include "base/string_number_conversions.h"
 #include "base/string16.h"
+#include "base/string_number_conversions.h"
 #include "chrome/browser/download/download_manager.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/download_item_gtk.cc b/chrome/browser/ui/gtk/download_item_gtk.cc
index a0f4569..755d44e 100644
--- a/chrome/browser/ui/gtk/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/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/gtk/download_item_gtk.h"
+#include "chrome/browser/ui/gtk/download_item_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -19,13 +19,13 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_util.h"
-#include "chrome/browser/gtk/custom_drag.h"
-#include "chrome/browser/gtk/download_shelf_gtk.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/menu_gtk.h"
-#include "chrome/browser/gtk/nine_box.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/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/nine_box.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/color_utils.h"
diff --git a/chrome/browser/ui/gtk/download_item_gtk.h b/chrome/browser/ui/gtk/download_item_gtk.h
index 9c539cc..b0c6e9c 100644
--- a/chrome/browser/ui/gtk/download_item_gtk.h
+++ b/chrome/browser/ui/gtk/download_item_gtk.h
@@ -15,7 +15,7 @@
 #include "base/time.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/icon_manager.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download_shelf_gtk.cc
index adb20cf..0a87534 100644
--- a/chrome/browser/ui/gtk/download_shelf_gtk.cc
+++ b/chrome/browser/ui/gtk/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/gtk/download_shelf_gtk.h"
+#include "chrome/browser/ui/gtk/download_shelf_gtk.h"
 
 #include <string>
 
@@ -11,14 +11,14 @@
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/download_item_gtk.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_chrome_shrinkable_hbox.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #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/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.h b/chrome/browser/ui/gtk/download_shelf_gtk.h
index e9c2506..650588b 100644
--- a/chrome/browser/ui/gtk/download_shelf_gtk.h
+++ b/chrome/browser/ui/gtk/download_shelf_gtk.h
@@ -13,8 +13,8 @@
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
-#include "chrome/browser/gtk/slide_animator_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
index f2fd6e9..e8819dd 100644
--- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc
+++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.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/gtk/edit_search_engine_dialog.h"
+#include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
 
 #include <gtk/gtk.h>
 
@@ -11,13 +11,13 @@
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
+#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/extension_infobar_gtk.cc
index 48f1613..59527cd 100644
--- a/chrome/browser/ui/gtk/extension_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/extension_infobar_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/gtk/extension_infobar_gtk.h"
+#include "chrome/browser/ui/gtk/extension_infobar_gtk.h"
 
 #include "app/resource_bundle.h"
 #include "chrome/browser/extensions/extension_host.h"
diff --git a/chrome/browser/ui/gtk/extension_infobar_gtk.h b/chrome/browser/ui/gtk/extension_infobar_gtk.h
index 8d24690..d6e768c 100644
--- a/chrome/browser/ui/gtk/extension_infobar_gtk.h
+++ b/chrome/browser/ui/gtk/extension_infobar_gtk.h
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_UI_GTK_EXTENSION_INFOBAR_GTK_H_
 #pragma once
 
-#include "chrome/browser/gtk/extension_view_gtk.h"
-#include "chrome/browser/gtk/infobar_gtk.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
+#include "chrome/browser/ui/gtk/extension_view_gtk.h"
+#include "chrome/browser/ui/gtk/infobar_gtk.h"
 #include "gfx/gtk_util.h"
 
 class ExtensionInfobarDelegate;
diff --git a/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc b/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc
index b35e7a1..8e41357 100644
--- a/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc
+++ b/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc
@@ -10,8 +10,8 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "gfx/gtk_util.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc b/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc
index 979bfb0..3a6134d1 100644
--- a/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc
+++ b/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "gfx/gtk_util.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc
index a1f3c35..a8fca31 100644
--- a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/extension_installed_bubble_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/gtk/extension_installed_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/extension_installed_bubble_gtk.h"
 
 #include <string>
 
@@ -11,13 +11,13 @@
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/browser_actions_toolbar_gtk.h"
-#include "chrome/browser/gtk/browser_toolbar_gtk.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h"
+#include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/notification_details.h"
diff --git a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.h b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.h
index a422c70..4c32b5c 100644
--- a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.h
@@ -8,8 +8,8 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/gtk/extension_popup_gtk.cc b/chrome/browser/ui/gtk/extension_popup_gtk.cc
index 412d394..e4bae2aa0 100644
--- a/chrome/browser/ui/gtk/extension_popup_gtk.cc
+++ b/chrome/browser/ui/gtk/extension_popup_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/gtk/extension_popup_gtk.h"
+#include "chrome/browser/ui/gtk/extension_popup_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -12,13 +12,13 @@
 #include "base/message_loop.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/ui/gtk/extension_popup_gtk.h b/chrome/browser/ui/gtk/extension_popup_gtk.h
index 779114d..14c1686 100644
--- a/chrome/browser/ui/gtk/extension_popup_gtk.h
+++ b/chrome/browser/ui/gtk/extension_popup_gtk.h
@@ -8,8 +8,8 @@
 
 #include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "chrome/browser/gtk/extension_view_gtk.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/extension_view_gtk.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/rect.h"
diff --git a/chrome/browser/ui/gtk/extension_view_gtk.cc b/chrome/browser/ui/gtk/extension_view_gtk.cc
index b39b6c6..72ad79b 100644
--- a/chrome/browser/ui/gtk/extension_view_gtk.cc
+++ b/chrome/browser/ui/gtk/extension_view_gtk.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/extension_view_gtk.h"
+#include "chrome/browser/ui/gtk/extension_view_gtk.h"
 
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/gtk/extension_popup_gtk.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
+#include "chrome/browser/ui/gtk/extension_popup_gtk.h"
 
 ExtensionViewGtk::ExtensionViewGtk(ExtensionHost* extension_host,
                                    Browser* browser)
diff --git a/chrome/browser/ui/gtk/external_protocol_dialog_gtk.cc b/chrome/browser/ui/gtk/external_protocol_dialog_gtk.cc
index 7fc1a88..79670c3 100644
--- a/chrome/browser/ui/gtk/external_protocol_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/external_protocol_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/gtk/external_protocol_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/external_protocol_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -10,13 +10,13 @@
 
 #include "app/l10n_util.h"
 #include "app/text_elider.h"
-#include "base/metrics/histogram.h"
 #include "base/message_loop.h"
+#include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/external_protocol_handler.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.h b/chrome/browser/ui/gtk/find_bar_gtk.h
index 514831d..2660298 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.h
+++ b/chrome/browser/ui/gtk/find_bar_gtk.h
@@ -10,10 +10,10 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/focus_store_gtk.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
-#include "chrome/browser/gtk/slide_animator_gtk.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
+#include "chrome/browser/ui/gtk/focus_store_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/point.h"
diff --git a/chrome/browser/ui/gtk/first_run_bubble.cc b/chrome/browser/ui/gtk/first_run_bubble.cc
index 11a61422..6528658 100644
--- a/chrome/browser/ui/gtk/first_run_bubble.cc
+++ b/chrome/browser/ui/gtk/first_run_bubble.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/gtk/first_run_bubble.h"
+#include "chrome/browser/ui/gtk/first_run_bubble.h"
 
 #include <gtk/gtk.h>
 
@@ -11,10 +11,10 @@
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/first_run_bubble.h b/chrome/browser/ui/gtk/first_run_bubble.h
index b03e321..36fe237 100644
--- a/chrome/browser/ui/gtk/first_run_bubble.h
+++ b/chrome/browser/ui/gtk/first_run_bubble.h
@@ -16,7 +16,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/first_run/first_run.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc
index eee9a13..2df1960 100644
--- a/chrome/browser/ui/gtk/first_run_dialog.cc
+++ b/chrome/browser/ui/gtk/first_run_dialog.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/gtk/first_run_dialog.h"
+#include "chrome/browser/ui/gtk/first_run_dialog.h"
 
 #include <string>
 #include <vector>
@@ -13,15 +13,15 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_floating_container.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/shell_integration.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_floating_container.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
diff --git a/chrome/browser/ui/gtk/focus_store_gtk.cc b/chrome/browser/ui/gtk/focus_store_gtk.cc
index f5e26db..7eb9047 100644
--- a/chrome/browser/ui/gtk/focus_store_gtk.cc
+++ b/chrome/browser/ui/gtk/focus_store_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/gtk/focus_store_gtk.h"
+#include "chrome/browser/ui/gtk/focus_store_gtk.h"
 
 #include <gtk/gtk.h>
 
diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc
index a53507d..2970685 100644
--- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/fullscreen_exit_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h"
 
 #include "app/l10n_util.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_floating_container.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/rounded_window.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_floating_container.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/rounded_window.h"
 #include "grit/app_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h
index 0831509..f5d92ef 100644
--- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h
@@ -9,7 +9,7 @@
 #include "app/gtk_signal.h"
 #include "app/gtk_signal_registrar.h"
 #include "base/timer.h"
-#include "chrome/browser/gtk/slide_animator_gtk.h"
+#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 
 typedef struct _GtkFloatingContainer GtkFloatingContainer;
 typedef struct _GtkWidget GtkWidget;
diff --git a/chrome/browser/ui/gtk/gconf_titlebar_listener.cc b/chrome/browser/ui/gtk/gconf_titlebar_listener.cc
index 6104263..7d3f784 100644
--- a/chrome/browser/ui/gtk/gconf_titlebar_listener.cc
+++ b/chrome/browser/ui/gtk/gconf_titlebar_listener.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gconf_titlebar_listener.h"
+#include "chrome/browser/ui/gtk/gconf_titlebar_listener.h"
 
 #include <gtk/gtk.h>
 
-#include "base/scoped_ptr.h"
-#include "base/singleton.h"
 #include "base/environment.h"
 #include "base/nix/xdg_util.h"
-#include "chrome/browser/gtk/browser_titlebar.h"
+#include "base/scoped_ptr.h"
+#include "base/singleton.h"
+#include "chrome/browser/ui/gtk/browser_titlebar.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/gtk/gtk_chrome_button.cc b/chrome/browser/ui/gtk/gtk_chrome_button.cc
index 9c01dbc..721fd97 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_button.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_button.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 
 #include "base/basictypes.h"
-#include "chrome/browser/gtk/nine_box.h"
+#include "chrome/browser/ui/gtk/nine_box.h"
 #include "gfx/gtk_util.h"
 #include "grit/app_resources.h"
 
diff --git a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc
index bd9717f..84174d6 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_chrome_cookie_view.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h"
 
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
 
 namespace {
diff --git a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
index 38514bf..b8f5a4e 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_link_button.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 
 #include <stdlib.h>
 
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/gtk_util.h"
 
 static const gchar* kLinkMarkup = "<u><span color=\"%s\">%s</span></u>";
diff --git a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
index db49fa4..4f8d857 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_chrome_shrinkable_hbox.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
 
 #include <gtk/gtk.h>
+
 #include <algorithm>
 
 namespace {
diff --git a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc
index c7bfcbe..226ebe7 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc
+++ b/chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.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/gtk/gtk_chrome_shrinkable_hbox.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
 
 #include <vector>
 
diff --git a/chrome/browser/ui/gtk/gtk_custom_menu.cc b/chrome/browser/ui/gtk/gtk_custom_menu.cc
index ed71a1a..f6119dd 100644
--- a/chrome/browser/ui/gtk/gtk_custom_menu.cc
+++ b/chrome/browser/ui/gtk/gtk_custom_menu.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_custom_menu.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
 
-#include "chrome/browser/gtk/gtk_custom_menu_item.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
 
 G_DEFINE_TYPE(GtkCustomMenu, gtk_custom_menu, GTK_TYPE_MENU)
 
diff --git a/chrome/browser/ui/gtk/gtk_custom_menu_item.cc b/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
index 9c3f0fd..f358f97 100644
--- a/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
+++ b/chrome/browser/ui/gtk/gtk_custom_menu_item.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_custom_menu_item.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
 
 #include "base/i18n/rtl.h"
-#include "chrome/browser/gtk/gtk_custom_menu.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
 
 enum {
   BUTTON_PUSHED,
diff --git a/chrome/browser/ui/gtk/gtk_expanded_container.cc b/chrome/browser/ui/gtk/gtk_expanded_container.cc
index 3b2a9a5..e0cf510 100644
--- a/chrome/browser/ui/gtk/gtk_expanded_container.cc
+++ b/chrome/browser/ui/gtk/gtk_expanded_container.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_expanded_container.h"
+#include "chrome/browser/ui/gtk/gtk_expanded_container.h"
 
 #include <gtk/gtk.h>
+
 #include <algorithm>
 
 namespace {
diff --git a/chrome/browser/ui/gtk/gtk_expanded_container_unittest.cc b/chrome/browser/ui/gtk/gtk_expanded_container_unittest.cc
index 609231b..77394d7 100644
--- a/chrome/browser/ui/gtk/gtk_expanded_container_unittest.cc
+++ b/chrome/browser/ui/gtk/gtk_expanded_container_unittest.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/gtk/gtk_expanded_container.h"
+#include "chrome/browser/ui/gtk/gtk_expanded_container.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/ui/gtk/gtk_floating_container.cc b/chrome/browser/ui/gtk/gtk_floating_container.cc
index 2b1f7f1..e3891a6 100644
--- a/chrome/browser/ui/gtk/gtk_floating_container.cc
+++ b/chrome/browser/ui/gtk/gtk_floating_container.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_floating_container.h"
+#include "chrome/browser/ui/gtk/gtk_floating_container.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkprivate.h>
 #include <gtk/gtkmarshal.h>
+#include <gtk/gtkprivate.h>
 
 #include <algorithm>
 
diff --git a/chrome/browser/ui/gtk/gtk_theme_provider.cc b/chrome/browser/ui/gtk/gtk_theme_provider.cc
index 31e2aca..72fbac6 100644
--- a/chrome/browser/ui/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/ui/gtk/gtk_theme_provider.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/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
@@ -11,16 +11,16 @@
 #include "app/gtk_signal_registrar.h"
 #include "app/resource_bundle.h"
 #include "base/environment.h"
-#include "base/stl_util-inl.h"
 #include "base/nix/xdg_util.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
-#include "chrome/browser/gtk/chrome_gtk_frame.h"
-#include "chrome/browser/gtk/gtk_chrome_button.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/hover_controller_gtk.h"
+#include "base/stl_util-inl.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
+#include "chrome/browser/ui/gtk/chrome_gtk_frame.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/hover_controller_gtk.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
diff --git a/chrome/browser/ui/gtk/gtk_theme_provider.h b/chrome/browser/ui/gtk/gtk_theme_provider.h
index 458c201..fa6b58a 100644
--- a/chrome/browser/ui/gtk/gtk_theme_provider.h
+++ b/chrome/browser/ui/gtk/gtk_theme_provider.h
@@ -13,8 +13,8 @@
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "gfx/color_utils.h"
 
diff --git a/chrome/browser/ui/gtk/gtk_theme_provider_unittest.cc b/chrome/browser/ui/gtk/gtk_theme_provider_unittest.cc
index baedfe0..30ad5ff 100644
--- a/chrome/browser/ui/gtk/gtk_theme_provider_unittest.cc
+++ b/chrome/browser/ui/gtk/gtk_theme_provider_unittest.cc
@@ -4,9 +4,9 @@
 
 #include <gtk/gtk.h>
 
-#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/gtk/gtk_tree.cc b/chrome/browser/ui/gtk/gtk_tree.cc
index 90d943c..035d38b 100644
--- a/chrome/browser/ui/gtk/gtk_tree.cc
+++ b/chrome/browser/ui/gtk/gtk_tree.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_tree.h"
+#include "chrome/browser/ui/gtk/gtk_tree.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc
index c837f24..41674bc 100644
--- a/chrome/browser/ui/gtk/gtk_util.cc
+++ b/chrome/browser/ui/gtk/gtk_util.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 #include <cstdarg>
 #include <map>
@@ -26,11 +26,11 @@
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/common/renderer_preferences.h"
 #include "gfx/gtk_util.h"
 #include "googleurl/src/gurl.h"
@@ -44,7 +44,7 @@
 #include "chrome/browser/chromeos/options/options_window_view.h"
 #include "views/window/window.h"
 #else
-#include "chrome/browser/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #endif
 
 using WebKit::WebDragOperationsMask;
diff --git a/chrome/browser/ui/gtk/hover_controller_gtk.cc b/chrome/browser/ui/gtk/hover_controller_gtk.cc
index 617556e..f110ad8 100644
--- a/chrome/browser/ui/gtk/hover_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/hover_controller_gtk.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/hover_controller_gtk.h"
+#include "chrome/browser/ui/gtk/hover_controller_gtk.h"
 
 #include "base/message_loop.h"
-#include "chrome/browser/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 
 static const gchar* kHoverControllerGtkKey = "__HOVER_CONTROLLER_GTK__";
 
diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc
index bec9abd..2d9159e 100644
--- a/chrome/browser/ui/gtk/html_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/html_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/html_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "ipc/ipc_message.h"
 
diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
index 25c5a6a..226ae96 100644
--- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
@@ -12,10 +12,10 @@
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/result_codes.h"
 #include "gfx/gtk_util.h"
diff --git a/chrome/browser/ui/gtk/import_dialog_gtk.cc b/chrome/browser/ui/gtk/import_dialog_gtk.cc
index 5ec7666..3d1a815 100644
--- a/chrome/browser/ui/gtk/import_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/import_dialog_gtk.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/import_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/import_dialog_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/importer/importer_data_types.h"
+#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
diff --git a/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc b/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc
index 30b7cab..54313fd 100644
--- a/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/import_lock_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/import_lock_dialog_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/importer/importer.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc
index 80f9731..56fd465 100644
--- a/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/import_progress_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/import_progress_dialog_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/info_bubble_accelerators_gtk.cc b/chrome/browser/ui/gtk/info_bubble_accelerators_gtk.cc
index 0c63cfe..a0a1fb1 100644
--- a/chrome/browser/ui/gtk/info_bubble_accelerators_gtk.cc
+++ b/chrome/browser/ui/gtk/info_bubble_accelerators_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/gtk/info_bubble_accelerators_gtk.h"
+#include "chrome/browser/ui/gtk/info_bubble_accelerators_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <glib.h>
diff --git a/chrome/browser/ui/gtk/info_bubble_gtk.cc b/chrome/browser/ui/gtk/info_bubble_gtk.cc
index 33131de..beaf56e 100644
--- a/chrome/browser/ui/gtk/info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/info_bubble_gtk.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/info_bubble_accelerators_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/info_bubble_accelerators_gtk.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
 #include "gfx/path.h"
diff --git a/chrome/browser/ui/gtk/infobar_arrow_model.cc b/chrome/browser/ui/gtk/infobar_arrow_model.cc
index cc24d5c..3128711e 100644
--- a/chrome/browser/ui/gtk/infobar_arrow_model.cc
+++ b/chrome/browser/ui/gtk/infobar_arrow_model.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/infobar_arrow_model.h"
+#include "chrome/browser/ui/gtk/infobar_arrow_model.h"
 
-#include "chrome/browser/gtk/infobar_gtk.h"
+#include "chrome/browser/ui/gtk/infobar_gtk.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/color_utils.h"
 #include "gfx/point.h"
diff --git a/chrome/browser/ui/gtk/infobar_container_gtk.cc b/chrome/browser/ui/gtk/infobar_container_gtk.cc
index 6a6e1c8..8c085ed 100644
--- a/chrome/browser/ui/gtk/infobar_container_gtk.cc
+++ b/chrome/browser/ui/gtk/infobar_container_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/gtk/infobar_container_gtk.h"
+#include "chrome/browser/ui/gtk/infobar_container_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -10,13 +10,13 @@
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/infobar_gtk.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/infobar_gtk.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "third_party/skia/include/core/SkPaint.h"
diff --git a/chrome/browser/ui/gtk/infobar_container_gtk.h b/chrome/browser/ui/gtk/infobar_container_gtk.h
index d25fa0e..f2856cf 100644
--- a/chrome/browser/ui/gtk/infobar_container_gtk.h
+++ b/chrome/browser/ui/gtk/infobar_container_gtk.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/ui/gtk/infobar_gtk.cc b/chrome/browser/ui/gtk/infobar_gtk.cc
index e5f812b..28b6b2c 100644
--- a/chrome/browser/ui/gtk/infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/infobar_gtk.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/infobar_gtk.h"
+#include "chrome/browser/ui/gtk/infobar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_chrome_shrinkable_hbox.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/infobar_container_gtk.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/custom_button.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_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/infobar_container_gtk.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
 
diff --git a/chrome/browser/ui/gtk/infobar_gtk.h b/chrome/browser/ui/gtk/infobar_gtk.h
index 6d27c6f..5e1c458 100644
--- a/chrome/browser/ui/gtk/infobar_gtk.h
+++ b/chrome/browser/ui/gtk/infobar_gtk.h
@@ -9,10 +9,10 @@
 #include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/infobar_arrow_model.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
-#include "chrome/browser/gtk/slide_animator_gtk.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/ui/gtk/infobar_arrow_model.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "third_party/skia/include/core/SkPaint.h"
diff --git a/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc b/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc
index 59a153f..38722e4 100644
--- a/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/instant_confirm_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/instant_confirm_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/options/show_options_url.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc b/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
index e1da7c7..cba5810 100644
--- a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/js_modal_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/gtk/js_modal_dialog_gtk.h"
+#include "chrome/browser/ui/gtk/js_modal_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -10,8 +10,8 @@
 #include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
diff --git a/chrome/browser/ui/gtk/keyword_editor_view.cc b/chrome/browser/ui/gtk/keyword_editor_view.cc
index 5463c57..785ea34 100644
--- a/chrome/browser/ui/gtk/keyword_editor_view.cc
+++ b/chrome/browser/ui/gtk/keyword_editor_view.cc
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/keyword_editor_view.h"
+#include "chrome/browser/ui/gtk/keyword_editor_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
-#include "chrome/browser/gtk/edit_search_engine_dialog.h"
-#include "chrome/browser/gtk/gtk_tree.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_table_model.h"
+#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
+#include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
+#include "chrome/browser/ui/gtk/gtk_tree.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc b/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc
index acc4e07..330634a 100644
--- a/chrome/browser/ui/gtk/keyword_editor_view_unittest.cc
+++ b/chrome/browser/ui/gtk/keyword_editor_view_unittest.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/gtk/keyword_editor_view.h"
+#include "chrome/browser/ui/gtk/keyword_editor_view.h"
 
 #include <gtk/gtk.h>
 
@@ -12,10 +12,10 @@
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/gtk_tree.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_table_model.h"
+#include "chrome/browser/ui/gtk/gtk_tree.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index bd870c83..84be94e 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_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/gtk/location_bar_view_gtk.h"
+#include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
@@ -28,25 +28,25 @@
 #include "chrome/browser/content_setting_image_model.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/gtk/bookmark_bubble_gtk.h"
-#include "chrome/browser/gtk/bookmark_utils_gtk.h"
-#include "chrome/browser/gtk/cairo_cached_surface.h"
-#include "chrome/browser/gtk/content_setting_bubble_gtk.h"
-#include "chrome/browser/gtk/extension_popup_gtk.h"
-#include "chrome/browser/gtk/first_run_bubble.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/nine_box.h"
-#include "chrome/browser/gtk/rounded_window.h"
-#include "chrome/browser/gtk/view_id_util.h"
+#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/bookmark_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/cairo_cached_surface.h"
+#include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/extension_popup_gtk.h"
+#include "chrome/browser/ui/gtk/first_run_bubble.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/nine_box.h"
+#include "chrome/browser/ui/gtk/rounded_window.h"
+#include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/browser/ui/omnibox/location_bar_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
index abf94f1..2a82530 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
@@ -20,9 +20,9 @@
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/first_run/first_run.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
-#include "chrome/browser/gtk/menu_gtk.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_observer.h"
diff --git a/chrome/browser/ui/gtk/menu_bar_helper.cc b/chrome/browser/ui/gtk/menu_bar_helper.cc
index b2cba9d..11803b9 100644
--- a/chrome/browser/ui/gtk/menu_bar_helper.cc
+++ b/chrome/browser/ui/gtk/menu_bar_helper.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/menu_bar_helper.h"
+#include "chrome/browser/ui/gtk/menu_bar_helper.h"
 
 #include <algorithm>
 
 #include "app/gtk_signal_registrar.h"
 #include "base/logging.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 namespace {
 
diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc
index af8ae5c..2df1f56 100644
--- a/chrome/browser/ui/gtk/menu_gtk.cc
+++ b/chrome/browser/ui/gtk/menu_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/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 
 #include <map>
 
@@ -12,9 +12,9 @@
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/gtk/gtk_custom_menu.h"
-#include "chrome/browser/gtk/gtk_custom_menu_item.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
+#include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/accelerator_gtk.h"
diff --git a/chrome/browser/ui/gtk/nine_box.cc b/chrome/browser/ui/gtk/nine_box.cc
index 6cfe959..8eb39fc 100644
--- a/chrome/browser/ui/gtk/nine_box.cc
+++ b/chrome/browser/ui/gtk/nine_box.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/gtk/nine_box.h"
+#include "chrome/browser/ui/gtk/nine_box.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
diff --git a/chrome/browser/ui/gtk/overflow_button.cc b/chrome/browser/ui/gtk/overflow_button.cc
index 73290f5..f2f6a58 100644
--- a/chrome/browser/ui/gtk/overflow_button.cc
+++ b/chrome/browser/ui/gtk/overflow_button.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/overflow_button.h"
+#include "chrome/browser/ui/gtk/overflow_button.h"
 
 #include <gtk/gtk.h>
 
 #include "app/resource_bundle.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/gtk/overflow_button.h b/chrome/browser/ui/gtk/overflow_button.h
index 61e921c..298e5a2 100644
--- a/chrome/browser/ui/gtk/overflow_button.h
+++ b/chrome/browser/ui/gtk/overflow_button.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_GTK_OVERFLOW_BUTTON_H_
 #pragma once
 
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/ui/gtk/owned_widget_gtk.cc b/chrome/browser/ui/gtk/owned_widget_gtk.cc
index 297b1a9..5448115 100644
--- a/chrome/browser/ui/gtk/owned_widget_gtk.cc
+++ b/chrome/browser/ui/gtk/owned_widget_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/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 
 #include <gtk/gtk.h>
 
diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
index fef4b59..b73823c 100644
--- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
@@ -12,15 +12,15 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/gtk/browser_toolbar_gtk.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
-#include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/page_info_window.h"
+#include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/info_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/ui/gtk/process_singleton_dialog.cc b/chrome/browser/ui/gtk/process_singleton_dialog.cc
index da55fd8..ac1b97e 100644
--- a/chrome/browser/ui/gtk/process_singleton_dialog.cc
+++ b/chrome/browser/ui/gtk/process_singleton_dialog.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/process_singleton_dialog.h"
+#include "chrome/browser/ui/gtk/process_singleton_dialog.h"
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 
 // static
diff --git a/chrome/browser/ui/gtk/reload_button_gtk.cc b/chrome/browser/ui/gtk/reload_button_gtk.cc
index 4af3be3..36972b5 100644
--- a/chrome/browser/ui/gtk/reload_button_gtk.cc
+++ b/chrome/browser/ui/gtk/reload_button_gtk.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/reload_button_gtk.h"
+#include "chrome/browser/ui/gtk/reload_button_gtk.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/gtk/gtk_chrome_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/gtk/reload_button_gtk.h b/chrome/browser/ui/gtk/reload_button_gtk.h
index 82662f7..bdd5e53 100644
--- a/chrome/browser/ui/gtk/reload_button_gtk.h
+++ b/chrome/browser/ui/gtk/reload_button_gtk.h
@@ -11,8 +11,8 @@
 #include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "base/timer.h"
-#include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/ui/gtk/reload_button_gtk_unittest.cc b/chrome/browser/ui/gtk/reload_button_gtk_unittest.cc
index 3e39017..6a612d8 100644
--- a/chrome/browser/ui/gtk/reload_button_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/reload_button_gtk_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "chrome/browser/gtk/reload_button_gtk.h"
+#include "chrome/browser/ui/gtk/reload_button_gtk.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ReloadButtonGtkTest : public testing::Test {
diff --git a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc
index dfd1ac6..1416160 100644
--- a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc
+++ b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/repost_form_warning_gtk.h"
+#include "chrome/browser/ui/gtk/repost_form_warning_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/repost_form_warning_controller.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/notification_type.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/ui/gtk/repost_form_warning_gtk.h b/chrome/browser/ui/gtk/repost_form_warning_gtk.h
index 6f97302..551164c 100644
--- a/chrome/browser/ui/gtk/repost_form_warning_gtk.h
+++ b/chrome/browser/ui/gtk/repost_form_warning_gtk.h
@@ -10,7 +10,7 @@
 
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 
 class RepostFormWarningController;
 
diff --git a/chrome/browser/ui/gtk/rounded_window.cc b/chrome/browser/ui/gtk/rounded_window.cc
index 5851072..42742ff 100644
--- a/chrome/browser/ui/gtk/rounded_window.cc
+++ b/chrome/browser/ui/gtk/rounded_window.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/gtk/rounded_window.h"
+#include "chrome/browser/ui/gtk/rounded_window.h"
 
 #include <gtk/gtk.h>
 #include <math.h>
@@ -10,7 +10,7 @@
 #include "app/gtk_signal_registrar.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 namespace gtk_util {
 
diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc
index 1a3dc27..8985417 100644
--- a/chrome/browser/ui/gtk/sad_tab_gtk.cc
+++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/sad_tab_gtk.h"
+#include "chrome/browser/ui/gtk/sad_tab_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.h b/chrome/browser/ui/gtk/sad_tab_gtk.h
index b2300d1..cd756fd 100644
--- a/chrome/browser/ui/gtk/sad_tab_gtk.h
+++ b/chrome/browser/ui/gtk/sad_tab_gtk.h
@@ -9,7 +9,7 @@
 typedef struct _GtkWidget GtkWidget;
 
 #include "app/gtk_signal.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 
 class TabContents;
 
diff --git a/chrome/browser/ui/gtk/slide_animator_gtk.cc b/chrome/browser/ui/gtk/slide_animator_gtk.cc
index 9e09a3f..e18b748 100644
--- a/chrome/browser/ui/gtk/slide_animator_gtk.cc
+++ b/chrome/browser/ui/gtk/slide_animator_gtk.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/slide_animator_gtk.h"
+#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 
-#include "chrome/browser/gtk/gtk_expanded_container.h"
+#include "chrome/browser/ui/gtk/gtk_expanded_container.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/slide_animation.h"
 
diff --git a/chrome/browser/ui/gtk/slide_animator_gtk.h b/chrome/browser/ui/gtk/slide_animator_gtk.h
index a8f6b97..4e8fd0d 100644
--- a/chrome/browser/ui/gtk/slide_animator_gtk.h
+++ b/chrome/browser/ui/gtk/slide_animator_gtk.h
@@ -18,7 +18,7 @@
 #include <gtk/gtk.h>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "ui/base/animation/animation_delegate.h"
 
 namespace ui {
diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
index 6657795..fc8144e 100644
--- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc
@@ -16,12 +16,12 @@
 #include "base/nss_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
-#include "chrome/browser/gtk/constrained_window_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/ssl/ssl_client_auth_handler.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "gfx/native_widget_types.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc
index 48557e0..f9b3b81 100644
--- a/chrome/browser/ui/gtk/status_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/status_bubble_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/gtk/status_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/status_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -12,10 +12,10 @@
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/rounded_window.h"
-#include "chrome/browser/gtk/slide_animator_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/rounded_window.h"
+#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
 #include "chrome/common/notification_service.h"
 #include "ui/base/animation/slide_animation.h"
 
diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.h b/chrome/browser/ui/gtk/status_bubble_gtk.h
index 6ecb031..743213d 100644
--- a/chrome/browser/ui/gtk/status_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/status_bubble_gtk.h
@@ -13,7 +13,7 @@
 #include "app/gtk_signal.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
index fd4a643..aad9d2e 100644
--- a/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
+++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/tab_contents_container_gtk.h"
+#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
-#include "chrome/browser/gtk/gtk_expanded_container.h"
-#include "chrome/browser/gtk/gtk_floating_container.h"
-#include "chrome/browser/gtk/status_bubble_gtk.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/gtk_expanded_container.h"
+#include "chrome/browser/ui/gtk/gtk_floating_container.h"
+#include "chrome/browser/ui/gtk/status_bubble_gtk.h"
 #include "chrome/common/notification_source.h"
 #include "gfx/native_widget_types.h"
 
diff --git a/chrome/browser/ui/gtk/tab_contents_container_gtk.h b/chrome/browser/ui/gtk/tab_contents_container_gtk.h
index a2ecf3b..24eaa99 100644
--- a/chrome/browser/ui/gtk/tab_contents_container_gtk.h
+++ b/chrome/browser/ui/gtk/tab_contents_container_gtk.h
@@ -10,8 +10,8 @@
 
 #include "app/gtk_signal.h"
 #include "base/basictypes.h"
-#include "chrome/browser/gtk/owned_widget_gtk.h"
-#include "chrome/browser/gtk/view_id_util.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
+#include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/ui/gtk/tab_contents_drag_source.cc b/chrome/browser/ui/gtk/tab_contents_drag_source.cc
index 29eb349..6413565 100644
--- a/chrome/browser/ui/gtk/tab_contents_drag_source.cc
+++ b/chrome/browser/ui/gtk/tab_contents_drag_source.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/gtk/tab_contents_drag_source.h"
+#include "chrome/browser/ui/gtk/tab_contents_drag_source.h"
 
 #include <string>
 
@@ -13,11 +13,11 @@
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/download/drag_download_file.h"
 #include "chrome/browser/download/drag_download_util.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/gtk_util.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index 45459c7..ff0fd76 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_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/gtk/task_manager_gtk.h"
+#include "chrome/browser/ui/gtk/task_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
@@ -19,12 +19,12 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
-#include "chrome/browser/gtk/gtk_tree.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/memory_purger.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_provider.h"
+#include "chrome/browser/ui/gtk/gtk_tree.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/gtk_util.h"
@@ -36,7 +36,7 @@
 #if defined(TOOLKIT_VIEWS)
 #include "views/controls/menu/menu_2.h"
 #else
-#include "chrome/browser/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc b/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc
index 366fa8e..562744f 100644
--- a/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc
+++ b/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/theme_install_bubble_view_gtk.h"
+#include "chrome/browser/ui/gtk/theme_install_bubble_view_gtk.h"
 
 #include <math.h>
 
 #include "app/l10n_util.h"
-#include "chrome/browser/gtk/gtk_util.h"
-#include "chrome/browser/gtk/rounded_window.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/rounded_window.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/update_recommended_dialog.cc b/chrome/browser/ui/gtk/update_recommended_dialog.cc
index fd12814..ba6706b 100644
--- a/chrome/browser/ui/gtk/update_recommended_dialog.cc
+++ b/chrome/browser/ui/gtk/update_recommended_dialog.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/gtk/update_recommended_dialog.h"
+#include "chrome/browser/ui/gtk/update_recommended_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/view_id_util.cc b/chrome/browser/ui/gtk/view_id_util.cc
index 6e732bc..2b033c5 100644
--- a/chrome/browser/ui/gtk/view_id_util.cc
+++ b/chrome/browser/ui/gtk/view_id_util.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/gtk/view_id_util.h"
+#include "chrome/browser/ui/gtk/view_id_util.h"
 
 #include <stdint.h>
 #include <string>
diff --git a/chrome/browser/ui/gtk/view_id_util_browsertest.cc b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
index 154ed20..88b74bd 100644
--- a/chrome/browser/ui/gtk/view_id_util_browsertest.cc
+++ b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
@@ -5,8 +5,8 @@
 #include <gtk/gtk.h>
 
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 
diff --git a/chrome/browser/ui/input_window_dialog_gtk.cc b/chrome/browser/ui/input_window_dialog_gtk.cc
index 87696bb..8f78cb5 100644
--- a/chrome/browser/ui/input_window_dialog_gtk.cc
+++ b/chrome/browser/ui/input_window_dialog_gtk.cc
@@ -11,7 +11,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 
 class InputWindowDialogGtk : public InputWindowDialog {
  public:
diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc
index 8cdd6e0..fe0e0a5 100644
--- a/chrome/browser/ui/login/login_prompt_gtk.cc
+++ b/chrome/browser/ui/login/login_prompt_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,12 +6,10 @@
 
 #include <gtk/gtk.h>
 
-#include "app/l10n_util.h"
 #include "app/gtk_signal.h"
+#include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/gtk/constrained_window_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ -19,6 +17,8 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/login/login_model.h"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_request.h"
diff --git a/chrome/browser/ui/tabs/dock_info_gtk.cc b/chrome/browser/ui/tabs/dock_info_gtk.cc
index 3fb2778..abe02e7 100644
--- a/chrome/browser/ui/tabs/dock_info_gtk.cc
+++ b/chrome/browser/ui/tabs/dock_info_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -8,10 +8,10 @@
 
 #include "base/logging.h"
 #include "base/task.h"
-#include "chrome/browser/gtk/browser_window_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/gtk/browser_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/native_widget_types.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index b3d9c5f..25ddc19 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -18,8 +18,8 @@
 #include "chrome/browser/background_page_tracker.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -39,7 +39,7 @@
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
 #if defined(OS_MACOSX)
diff --git a/chrome/browser/ui/view_ids.h b/chrome/browser/ui/view_ids.h
index 948eabb..3df052d 100644
--- a/chrome/browser/ui/view_ids.h
+++ b/chrome/browser/ui/view_ids.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 // This defines an enumeration of IDs that can uniquely identify a view within
 // the scope of a container view.
 
-#ifndef CHROME_BROWSER_VIEW_IDS_H_
-#define CHROME_BROWSER_VIEW_IDS_H_
+#ifndef CHROME_BROWSER_UI_VIEW_IDS_H_
+#define CHROME_BROWSER_UI_VIEW_IDS_H_
 #pragma once
 
 enum ViewID {
@@ -78,9 +78,10 @@ enum ViewID {
   // The sidebar split.
   VIEW_ID_SIDE_BAR_SPLIT,
 
-  // Used in chrome/browser/gtk/view_id_util_browsertests.cc
+  // Used in chrome/browser/ui/gtk/view_id_util_browsertests.cc
   // If you add new ids, make sure the above test passes.
   VIEW_ID_PREDEFINED_COUNT
 };
 
-#endif  // CHROME_BROWSER_VIEW_IDS_H_
+#endif  // CHROME_BROWSER_UI_VIEW_IDS_H_
+
diff --git a/chrome/browser/ui/views/accessible_view_helper.h b/chrome/browser/ui/views/accessible_view_helper.h
index 7a6c848..45a5195 100644
--- a/chrome/browser/ui/views/accessible_view_helper.h
+++ b/chrome/browser/ui/views/accessible_view_helper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -16,7 +16,7 @@
 #include "gfx/native_widget_types.h"
 
 #if defined(OS_LINUX)
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
+#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
 #endif
 
 class AccessibilityEventRouterViews;
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index 2febb5a..c2de10a 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -7,8 +7,8 @@
 #include "app/bidi_line_iterator.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/theme_provider.h"
 #include "app/text_elider.h"
+#include "app/theme_provider.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ -38,16 +38,16 @@
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
-#include <objidl.h>
 #include <commctrl.h>
 #include <dwmapi.h>
+#include <objidl.h>
 
 #include "app/win/hwnd_util.h"
 #include "base/win/scoped_gdi_object.h"
 #endif
 
 #if defined(OS_LINUX)
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "gfx/skia_utils_gtk.h"
 #endif
 
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc
index d78ea13..12c735d 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
-#include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "gfx/insets.h"
 
diff --git a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
index 60f3ec4..1aa18e1 100644
--- a/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
+++ b/chrome/browser/ui/views/constrained_html_delegate_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,10 +6,10 @@
 
 #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/gtk/constrained_window_gtk.h"
-#include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "gfx/rect.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/browser/ui/views/default_search_view.h b/chrome/browser/ui/views/default_search_view.h
index 607bca69..a60263e 100644
--- a/chrome/browser/ui/views/default_search_view.h
+++ b/chrome/browser/ui/views/default_search_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,7 +13,7 @@
 #include "views/window/dialog_delegate.h"
 
 #if defined(TOOLKIT_USES_GTK)
-#include "chrome/browser/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #endif
 
 class PrefService;
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc
index a3dfca2..c65198a 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.cc
@@ -11,8 +11,6 @@
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "chrome/browser/gtk/constrained_window_gtk.h"
-#include "chrome/browser/gtk/tab_contents_drag_source.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
@@ -20,6 +18,8 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h"
+#include "chrome/browser/ui/gtk/constrained_window_gtk.h"
+#include "chrome/browser/ui/gtk/tab_contents_drag_source.h"
 #include "chrome/browser/ui/views/sad_tab_view.h"
 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
 #include "gfx/canvas_skia_paint.h"
author	msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-01-19 18:35:50 +0000
committer	msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2011-01-19 18:35:50 +0000
commit	0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2 (patch)
tree	192f05ac1fc2375ca4a49cea093f5b8e18b5546d /chrome
parent	757924a0ae4647cc48c1df1f097243d588ae09f5 (diff)
download	chromium_src-0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2.zip chromium_src-0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2.tar.gz chromium_src-0d8b9aa02fa25cbc73fb92b29cf3ce109e5c82d2.tar.bz2