diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 18:11:35 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 18:11:35 +0000 |
| commit | 2b05d66d9176cf44fb00e2c7d09a3fabf3b8b2ec (patch) | |
| tree | 05712e8dee0a22eaf47bb714ff3b89bc6a6a4a40 /chrome | |
| parent | 22b28c134e75d3f48479a42531f07776fd466d0f (diff) | |
| download | chromium_src-2b05d66d9176cf44fb00e2c7d09a3fabf3b8b2ec.zip chromium_src-2b05d66d9176cf44fb00e2c7d09a3fabf3b8b2ec.tar.gz chromium_src-2b05d66d9176cf44fb00e2c7d09a3fabf3b8b2ec.tar.bz2 | |
Update references part 1:
subdirectories of chrome/browser/ui/gtk/:
(notifications, options, status_icons, tabs, translate)
Update all chrome/browser/gtk references & copyright dates of touched files.
Re-alphabetize include lists as necessary from this change.
Remove the chrome/browser/gtk subdirectories & stubbed headers.
BUG=69289
TEST=None
Review URL: http://codereview.chromium.org/6328002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
98 files changed, 276 insertions, 660 deletions
diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc index 31bef3c..a107b25 100644 --- a/chrome/browser/chromeos/options/options_window_view.cc +++ b/chrome/browser/chromeos/options/options_window_view.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. @@ -7,12 +7,12 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/options/internet_page_view.h" #include "chrome/browser/chromeos/options/system_page_view.h" -#include "chrome/browser/gtk/options/advanced_page_gtk.h" -#include "chrome/browser/gtk/options/content_page_gtk.h" -#include "chrome/browser/gtk/options/general_page_gtk.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/gtk/options/advanced_page_gtk.h" +#include "chrome/browser/ui/gtk/options/content_page_gtk.h" +#include "chrome/browser/ui/gtk/options/general_page_gtk.h" #include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/views/accessible_view_helper.h" #include "chrome/browser/ui/views/window.h" diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.h b/chrome/browser/gtk/notifications/balloon_view_gtk.h deleted file mode 100644 index 842f938..0000000 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_GTK_H_ -#define CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/notifications/balloon_view_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_GTK_H_ diff --git a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h b/chrome/browser/gtk/notifications/balloon_view_host_gtk.h deleted file mode 100644 index b337ce9..0000000 --- a/chrome/browser/gtk/notifications/balloon_view_host_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_HOST_GTK_H_ -#define CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_HOST_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_NOTIFICATIONS_BALLOON_VIEW_HOST_GTK_H_ diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.h b/chrome/browser/gtk/options/advanced_contents_gtk.h deleted file mode 100644 index c0289d6..0000000 --- a/chrome/browser/gtk/options/advanced_contents_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_ADVANCED_CONTENTS_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_ADVANCED_CONTENTS_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/advanced_contents_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_ADVANCED_CONTENTS_GTK_H_ diff --git a/chrome/browser/gtk/options/advanced_page_gtk.h b/chrome/browser/gtk/options/advanced_page_gtk.h deleted file mode 100644 index 7973a54..0000000 --- a/chrome/browser/gtk/options/advanced_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_ADVANCED_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_ADVANCED_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/advanced_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_ADVANCED_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/content_exception_editor.h b/chrome/browser/gtk/options/content_exception_editor.h deleted file mode 100644 index 47e3e55..0000000 --- a/chrome/browser/gtk/options/content_exception_editor.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_CONTENT_EXCEPTION_EDITOR_H_ -#define CHROME_BROWSER_GTK_OPTIONS_CONTENT_EXCEPTION_EDITOR_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/content_exception_editor.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_CONTENT_EXCEPTION_EDITOR_H_ diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.h b/chrome/browser/gtk/options/content_exceptions_window_gtk.h deleted file mode 100644 index 577dd00..0000000 --- a/chrome/browser/gtk/options/content_exceptions_window_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_CONTENT_EXCEPTIONS_WINDOW_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_CONTENT_EXCEPTIONS_WINDOW_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/content_exceptions_window_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_CONTENT_EXCEPTIONS_WINDOW_GTK_H_ diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.h b/chrome/browser/gtk/options/content_filter_page_gtk.h deleted file mode 100644 index 8d8a693..0000000 --- a/chrome/browser/gtk/options/content_filter_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_CONTENT_FILTER_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_CONTENT_FILTER_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/content_filter_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_CONTENT_FILTER_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h deleted file mode 100644 index 533c432..0000000 --- a/chrome/browser/gtk/options/content_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_CONTENT_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_CONTENT_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/content_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_CONTENT_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.h b/chrome/browser/gtk/options/content_settings_window_gtk.h deleted file mode 100644 index 509ea0c..0000000 --- a/chrome/browser/gtk/options/content_settings_window_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_ diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.h b/chrome/browser/gtk/options/cookie_filter_page_gtk.h deleted file mode 100644 index 2953f3f..0000000 --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_COOKIE_FILTER_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_COOKIE_FILTER_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/cookie_filter_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_COOKIE_FILTER_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/cookies_view.h b/chrome/browser/gtk/options/cookies_view.h deleted file mode 100644 index cc89bc1..0000000 --- a/chrome/browser/gtk/options/cookies_view.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_COOKIES_VIEW_H_ -#define CHROME_BROWSER_GTK_OPTIONS_COOKIES_VIEW_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/cookies_view.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_COOKIES_VIEW_H_ diff --git a/chrome/browser/gtk/options/fonts_page_gtk.h b/chrome/browser/gtk/options/fonts_page_gtk.h deleted file mode 100644 index 9b6f029..0000000 --- a/chrome/browser/gtk/options/fonts_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_FONTS_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_FONTS_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/fonts_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_FONTS_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/general_page_gtk.h b/chrome/browser/gtk/options/general_page_gtk.h deleted file mode 100644 index 23ee51c0..0000000 --- a/chrome/browser/gtk/options/general_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_GENERAL_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_GENERAL_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/general_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_GENERAL_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/languages_page_gtk.h b/chrome/browser/gtk/options/languages_page_gtk.h deleted file mode 100644 index 1433e82..0000000 --- a/chrome/browser/gtk/options/languages_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_LANGUAGES_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_LANGUAGES_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/languages_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_LANGUAGES_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/managed_prefs_banner_gtk.h b/chrome/browser/gtk/options/managed_prefs_banner_gtk.h deleted file mode 100644 index 5681387..0000000 --- a/chrome/browser/gtk/options/managed_prefs_banner_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_MANAGED_PREFS_BANNER_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_MANAGED_PREFS_BANNER_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_MANAGED_PREFS_BANNER_GTK_H_ diff --git a/chrome/browser/gtk/options/options_layout_gtk.h b/chrome/browser/gtk/options/options_layout_gtk.h deleted file mode 100644 index d7e8196..0000000 --- a/chrome/browser/gtk/options/options_layout_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_OPTIONS_LAYOUT_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_OPTIONS_LAYOUT_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/options_layout_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_OPTIONS_LAYOUT_GTK_H_ diff --git a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.h b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.h deleted file mode 100644 index 6aedc68..0000000 --- a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_EXCEPTIONS_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_EXCEPTIONS_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_EXCEPTIONS_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.h b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.h deleted file mode 100644 index 5048098..0000000 --- a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_GTK_H_ diff --git a/chrome/browser/gtk/options/passwords_page_gtk.h b/chrome/browser/gtk/options/passwords_page_gtk.h deleted file mode 100644 index fd745af..0000000 --- a/chrome/browser/gtk/options/passwords_page_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_PAGE_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_PAGE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/passwords_page_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_PASSWORDS_PAGE_GTK_H_ diff --git a/chrome/browser/gtk/options/simple_content_exceptions_window.h b/chrome/browser/gtk/options/simple_content_exceptions_window.h deleted file mode 100644 index df5c971..0000000 --- a/chrome/browser/gtk/options/simple_content_exceptions_window.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_WINDOW_H_ -#define CHROME_BROWSER_GTK_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_WINDOW_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/simple_content_exceptions_window.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_WINDOW_H_ diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.h b/chrome/browser/gtk/options/url_picker_dialog_gtk.h deleted file mode 100644 index 9971437..0000000 --- a/chrome/browser/gtk/options/url_picker_dialog_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_OPTIONS_URL_PICKER_DIALOG_GTK_H_ -#define CHROME_BROWSER_GTK_OPTIONS_URL_PICKER_DIALOG_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_OPTIONS_URL_PICKER_DIALOG_GTK_H_ diff --git a/chrome/browser/gtk/status_icons/status_icon_gtk.h b/chrome/browser/gtk/status_icons/status_icon_gtk.h deleted file mode 100644 index 216d65c..0000000 --- a/chrome/browser/gtk/status_icons/status_icon_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_ -#define CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_ diff --git a/chrome/browser/gtk/status_icons/status_tray_gtk.h b/chrome/browser/gtk/status_icons/status_tray_gtk.h deleted file mode 100644 index a1873ad..0000000 --- a/chrome/browser/gtk/status_icons/status_tray_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_TRAY_GTK_H_ -#define CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_TRAY_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/status_icons/status_tray_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_TRAY_GTK_H_ diff --git a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h deleted file mode 100644 index c349be0..0000000 --- a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_ -#define CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_CONTROLLER_GTK_H_ diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_gtk.h deleted file mode 100644 index 501f757..0000000 --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_GTK_H_ -#define CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TABS_DRAGGED_TAB_GTK_H_ diff --git a/chrome/browser/gtk/tabs/tab_gtk.h b/chrome/browser/gtk/tabs/tab_gtk.h deleted file mode 100644 index b51b1a7..0000000 --- a/chrome/browser/gtk/tabs/tab_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TABS_TAB_GTK_H_ -#define CHROME_BROWSER_GTK_TABS_TAB_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/tabs/tab_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TABS_TAB_GTK_H_ diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h deleted file mode 100644 index 8e6562c..0000000 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_ -#define CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TABS_TAB_RENDERER_GTK_H_ diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.h b/chrome/browser/gtk/tabs/tab_strip_gtk.h deleted file mode 100644 index 4087991..0000000 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TABS_TAB_STRIP_GTK_H_ -#define CHROME_BROWSER_GTK_TABS_TAB_STRIP_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TABS_TAB_STRIP_GTK_H_ diff --git a/chrome/browser/gtk/translate/after_translate_infobar_gtk.h b/chrome/browser/gtk/translate/after_translate_infobar_gtk.h deleted file mode 100644 index edb2e3e..0000000 --- a/chrome/browser/gtk/translate/after_translate_infobar_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TRANSLATE_AFTER_TRANSLATE_INFOBAR_GTK_H_ -#define CHROME_BROWSER_GTK_TRANSLATE_AFTER_TRANSLATE_INFOBAR_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TRANSLATE_AFTER_TRANSLATE_INFOBAR_GTK_H_ diff --git a/chrome/browser/gtk/translate/before_translate_infobar_gtk.h b/chrome/browser/gtk/translate/before_translate_infobar_gtk.h deleted file mode 100644 index 08b3c9b..0000000 --- a/chrome/browser/gtk/translate/before_translate_infobar_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TRANSLATE_BEFORE_TRANSLATE_INFOBAR_GTK_H_ -#define CHROME_BROWSER_GTK_TRANSLATE_BEFORE_TRANSLATE_INFOBAR_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TRANSLATE_BEFORE_TRANSLATE_INFOBAR_GTK_H_ diff --git a/chrome/browser/gtk/translate/translate_infobar_base_gtk.h b/chrome/browser/gtk/translate/translate_infobar_base_gtk.h deleted file mode 100644 index 32d2505..0000000 --- a/chrome/browser/gtk/translate/translate_infobar_base_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TRANSLATE_TRANSLATE_INFOBAR_BASE_GTK_H_ -#define CHROME_BROWSER_GTK_TRANSLATE_TRANSLATE_INFOBAR_BASE_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TRANSLATE_TRANSLATE_INFOBAR_BASE_GTK_H_ diff --git a/chrome/browser/gtk/translate/translate_message_infobar_gtk.h b/chrome/browser/gtk/translate/translate_message_infobar_gtk.h deleted file mode 100644 index c44beb9..0000000 --- a/chrome/browser/gtk/translate/translate_message_infobar_gtk.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_GTK_TRANSLATE_TRANSLATE_MESSAGE_INFOBAR_GTK_H_ -#define CHROME_BROWSER_GTK_TRANSLATE_TRANSLATE_MESSAGE_INFOBAR_GTK_H_ -#pragma once - -#include "chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h" -// TODO(msw): remove this file once all includes have been updated. - -#endif // CHROME_BROWSER_GTK_TRANSLATE_TRANSLATE_MESSAGE_INFOBAR_GTK_H_ diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc index e86c4e2..237b009 100644 --- a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_bar_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_bar_gtk.h" +#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h" #include <vector> @@ -13,22 +13,6 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/gtk/bookmark_menu_controller_gtk.h" -#include "chrome/browser/gtk/bookmark_tree_model.h" -#include "chrome/browser/gtk/bookmark_utils_gtk.h" -#include "chrome/browser/gtk/browser_window_gtk.h" -#include "chrome/browser/gtk/cairo_cached_surface.h" -#include "chrome/browser/gtk/custom_button.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/hover_controller_gtk.h" -#include "chrome/browser/gtk/import_dialog_gtk.h" -#include "chrome/browser/gtk/menu_gtk.h" -#include "chrome/browser/gtk/rounded_window.h" -#include "chrome/browser/gtk/tabstrip_origin_provider.h" -#include "chrome/browser/gtk/tabs/tab_strip_gtk.h" -#include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/ntp_background_util.h" @@ -38,6 +22,22 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h" +#include "chrome/browser/ui/gtk/bookmark_tree_model.h" +#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" +#include "chrome/browser/ui/gtk/browser_window_gtk.h" +#include "chrome/browser/ui/gtk/cairo_cached_surface.h" +#include "chrome/browser/ui/gtk/custom_button.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/hover_controller_gtk.h" +#include "chrome/browser/ui/gtk/import_dialog_gtk.h" +#include "chrome/browser/ui/gtk/menu_gtk.h" +#include "chrome/browser/ui/gtk/rounded_window.h" +#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" +#include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" +#include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "gfx/canvas_skia_paint.h" diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk_unittest.cc index 31580f7..9581d50b1 100644 --- a/chrome/browser/ui/gtk/bookmark_bar_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/bookmark_bar_gtk_unittest.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/bookmark_bar_gtk.h" +#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h" #include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_thread.h" -#include "chrome/browser/gtk/tabstrip_origin_provider.h" +#include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 8412a17..67d63f8 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.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_titlebar.h" +#include "chrome/browser/ui/gtk/browser_titlebar.h" #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> @@ -18,21 +18,21 @@ #include "base/string_tokenizer.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/gtk/accelerators_gtk.h" -#include "chrome/browser/gtk/browser_window_gtk.h" -#include "chrome/browser/gtk/custom_button.h" -#if defined(USE_GCONF) -#include "chrome/browser/gtk/gconf_titlebar_listener.h" -#endif -#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/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/prefs/pref_service.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/accelerators_gtk.h" +#include "chrome/browser/ui/gtk/browser_window_gtk.h" +#include "chrome/browser/ui/gtk/custom_button.h" +#if defined(USE_GCONF) +#include "chrome/browser/ui/gtk/gconf_titlebar_listener.h" +#endif +#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/browser/ui/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index 820a6a8..4943f84 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_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_toolbar_gtk.h" +#include "chrome/browser/ui/gtk/browser_toolbar_gtk.h" #include <X11/XF86keysym.h> #include <gdk/gdkkeysyms.h> @@ -18,20 +18,6 @@ #include "base/singleton.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background_page_tracker.h" -#include "chrome/browser/gtk/accelerators_gtk.h" -#include "chrome/browser/gtk/back_forward_button_gtk.h" -#include "chrome/browser/gtk/browser_actions_toolbar_gtk.h" -#include "chrome/browser/gtk/browser_window_gtk.h" -#include "chrome/browser/gtk/cairo_cached_surface.h" -#include "chrome/browser/gtk/custom_button.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/gtk/reload_button_gtk.h" -#include "chrome/browser/gtk/rounded_window.h" -#include "chrome/browser/gtk/tabs/tab_strip_gtk.h" -#include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_service.h" @@ -39,6 +25,20 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/gtk/accelerators_gtk.h" +#include "chrome/browser/ui/gtk/back_forward_button_gtk.h" +#include "chrome/browser/ui/gtk/browser_actions_toolbar_gtk.h" +#include "chrome/browser/ui/gtk/browser_window_gtk.h" +#include "chrome/browser/ui/gtk/cairo_cached_surface.h" +#include "chrome/browser/ui/gtk/custom_button.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/browser/ui/gtk/reload_button_gtk.h" +#include "chrome/browser/ui/gtk/rounded_window.h" +#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" +#include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/common/notification_details.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index c8499f8..c90a6b3 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_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_window_gtk.h" +#include "chrome/browser/ui/gtk/browser_window_gtk.h" #include <gdk/gdkkeysyms.h> @@ -28,40 +28,6 @@ #include "chrome/browser/dom_ui/bug_report_ui.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" -#include "chrome/browser/gtk/about_chrome_dialog.h" -#include "chrome/browser/gtk/accelerators_gtk.h" -#include "chrome/browser/gtk/bookmark_bar_gtk.h" -#include "chrome/browser/gtk/browser_titlebar.h" -#include "chrome/browser/gtk/browser_toolbar_gtk.h" -#include "chrome/browser/gtk/cairo_cached_surface.h" -#include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" -#include "chrome/browser/gtk/collected_cookies_gtk.h" -#include "chrome/browser/gtk/create_application_shortcuts_dialog_gtk.h" -#include "chrome/browser/gtk/download_in_progress_dialog_gtk.h" -#include "chrome/browser/gtk/download_shelf_gtk.h" -#include "chrome/browser/gtk/edit_search_engine_dialog.h" -#include "chrome/browser/gtk/find_bar_gtk.h" -#include "chrome/browser/gtk/fullscreen_exit_bubble_gtk.h" -#include "chrome/browser/gtk/gtk_floating_container.h" -#include "chrome/browser/gtk/gtk_theme_provider.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/html_dialog_gtk.h" -#include "chrome/browser/gtk/import_dialog_gtk.h" -#include "chrome/browser/gtk/info_bubble_gtk.h" -#include "chrome/browser/gtk/infobar_container_gtk.h" -#include "chrome/browser/gtk/infobar_gtk.h" -#include "chrome/browser/gtk/keyword_editor_view.h" -#include "chrome/browser/gtk/location_bar_view_gtk.h" -#include "chrome/browser/gtk/nine_box.h" -#include "chrome/browser/gtk/options/content_settings_window_gtk.h" -#include "chrome/browser/gtk/reload_button_gtk.h" -#include "chrome/browser/gtk/repost_form_warning_gtk.h" -#include "chrome/browser/gtk/status_bubble_gtk.h" -#include "chrome/browser/gtk/tab_contents_container_gtk.h" -#include "chrome/browser/gtk/tabs/tab_strip_gtk.h" -#include "chrome/browser/gtk/task_manager_gtk.h" -#include "chrome/browser/gtk/theme_install_bubble_view_gtk.h" -#include "chrome/browser/gtk/update_recommended_dialog.h" #include "chrome/browser/page_info_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -72,6 +38,40 @@ #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/gtk/about_chrome_dialog.h" +#include "chrome/browser/ui/gtk/accelerators_gtk.h" +#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h" +#include "chrome/browser/ui/gtk/browser_titlebar.h" +#include "chrome/browser/ui/gtk/browser_toolbar_gtk.h" +#include "chrome/browser/ui/gtk/cairo_cached_surface.h" +#include "chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.h" +#include "chrome/browser/ui/gtk/collected_cookies_gtk.h" +#include "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h" +#include "chrome/browser/ui/gtk/download_in_progress_dialog_gtk.h" +#include "chrome/browser/ui/gtk/download_shelf_gtk.h" +#include "chrome/browser/ui/gtk/edit_search_engine_dialog.h" +#include "chrome/browser/ui/gtk/find_bar_gtk.h" +#include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h" +#include "chrome/browser/ui/gtk/gtk_floating_container.h" +#include "chrome/browser/ui/gtk/gtk_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/html_dialog_gtk.h" +#include "chrome/browser/ui/gtk/import_dialog_gtk.h" +#include "chrome/browser/ui/gtk/info_bubble_gtk.h" +#include "chrome/browser/ui/gtk/infobar_container_gtk.h" +#include "chrome/browser/ui/gtk/infobar_gtk.h" +#include "chrome/browser/ui/gtk/keyword_editor_view.h" +#include "chrome/browser/ui/gtk/location_bar_view_gtk.h" +#include "chrome/browser/ui/gtk/nine_box.h" +#include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" +#include "chrome/browser/ui/gtk/reload_button_gtk.h" +#include "chrome/browser/ui/gtk/repost_form_warning_gtk.h" +#include "chrome/browser/ui/gtk/status_bubble_gtk.h" +#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" +#include "chrome/browser/ui/gtk/task_manager_gtk.h" +#include "chrome/browser/ui/gtk/theme_install_bubble_view_gtk.h" +#include "chrome/browser/ui/gtk/update_recommended_dialog.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/window_sizer.h" diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc index c3ca05c..da481b5 100644 --- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/content_setting_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/content_setting_bubble_gtk.h" +#include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h" #include <set> #include <string> @@ -15,12 +15,12 @@ #include "chrome/browser/blocked_content_container.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_setting_bubble_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/options/content_settings_window_gtk.h" #include "chrome/browser/profiles/profile.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_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" #include "chrome/common/content_settings.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index 6fd27c8..cba73f9 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_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/find_bar_gtk.h" +#include "chrome/browser/ui/gtk/find_bar_gtk.h" #include <gdk/gdkkeysyms.h> @@ -16,23 +16,23 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/browser_window_gtk.h" -#include "chrome/browser/gtk/cairo_cached_surface.h" -#include "chrome/browser/gtk/custom_button.h" -#include "chrome/browser/gtk/gtk_floating_container.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/slide_animator_gtk.h" -#include "chrome/browser/gtk/tab_contents_container_gtk.h" -#include "chrome/browser/gtk/tabs/tab_strip_gtk.h" -#include "chrome/browser/gtk/view_id_util.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/browser.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_bar_state.h" +#include "chrome/browser/ui/gtk/browser_window_gtk.h" +#include "chrome/browser/ui/gtk/cairo_cached_surface.h" +#include "chrome/browser/ui/gtk/custom_button.h" +#include "chrome/browser/ui/gtk/gtk_floating_container.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/slide_animator_gtk.h" +#include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" +#include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index cef0771..2d45e4c 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_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/notifications/balloon_view_gtk.h" +#include "chrome/browser/ui/gtk/notifications/balloon_view_gtk.h" #include <gtk/gtk.h> @@ -17,13 +17,6 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" -#include "chrome/browser/gtk/custom_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/menu_gtk.h" -#include "chrome/browser/gtk/notifications/balloon_view_host_gtk.h" -#include "chrome/browser/gtk/rounded_window.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification.h" @@ -32,6 +25,13 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/gtk/custom_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/menu_gtk.h" +#include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h" +#include "chrome/browser/ui/gtk/rounded_window.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h index 99531c5..c215ad6 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.h @@ -11,9 +11,9 @@ #include "app/gtk_signal.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/browser/gtk/menu_gtk.h" -#include "chrome/browser/gtk/notifications/balloon_view_host_gtk.h" #include "chrome/browser/notifications/balloon.h" +#include "chrome/browser/ui/gtk/menu_gtk.h" +#include "chrome/browser/ui/gtk/notifications/balloon_view_host_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/notifications/balloon_view_host_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc index be7a089..7d85faa 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_host_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/notifications/balloon_view_host_gtk.h" +#include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/ui/gtk/options/advanced_contents_gtk.cc b/chrome/browser/ui/gtk/options/advanced_contents_gtk.cc index c769cf1..a410fd2 100644 --- a/chrome/browser/ui/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/ui/gtk/options/advanced_contents_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/options/advanced_contents_gtk.h" +#include "chrome/browser/ui/gtk/options/advanced_contents_gtk.h" #include <sys/types.h> #include <sys/wait.h> @@ -26,17 +26,17 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/fonts_languages_window.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/gtk/accessible_widget_helper_gtk.h" -#include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" -#include "chrome/browser/gtk/gtk_chrome_link_button.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/options/content_settings_window_gtk.h" -#include "chrome/browser/gtk/options/options_layout_gtk.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_set_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" +#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" +#include "chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.h" +#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" +#include "chrome/browser/ui/gtk/options/options_layout_gtk.h" #include "chrome/browser/ui/options/options_page_base.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/browser/ui/options/show_options_url.h" diff --git a/chrome/browser/ui/gtk/options/advanced_page_gtk.cc b/chrome/browser/ui/gtk/options/advanced_page_gtk.cc index 132e7b4..54e7b82 100644 --- a/chrome/browser/ui/gtk/options/advanced_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/advanced_page_gtk.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/options/advanced_page_gtk.h" +#include "chrome/browser/ui/gtk/options/advanced_page_gtk.h" #include "app/l10n_util.h" -#include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/options/options_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/options/advanced_page_gtk.h b/chrome/browser/ui/gtk/options/advanced_page_gtk.h index 22eb1fd..3477ff4 100644 --- a/chrome/browser/ui/gtk/options/advanced_page_gtk.h +++ b/chrome/browser/ui/gtk/options/advanced_page_gtk.h @@ -9,9 +9,9 @@ #include <gtk/gtk.h> #include "app/gtk_signal.h" -#include "chrome/browser/gtk/options/advanced_contents_gtk.h" -#include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/gtk/options/advanced_contents_gtk.h" +#include "chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h" #include "chrome/browser/ui/options/options_page_base.h" class Profile; diff --git a/chrome/browser/ui/gtk/options/content_exception_editor.cc b/chrome/browser/ui/gtk/options/content_exception_editor.cc index 709393b..06f1fa6 100644 --- a/chrome/browser/ui/gtk/options/content_exception_editor.cc +++ b/chrome/browser/ui/gtk/options/content_exception_editor.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/options/content_exception_editor.h" +#include "chrome/browser/ui/gtk/options/content_exception_editor.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -10,7 +10,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc index 4bf3f73..191dae6 100644 --- a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_exceptions_window_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/options/content_exceptions_window_gtk.h" +#include "chrome/browser/ui/gtk/options/content_exceptions_window_gtk.h" #include <set> #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/options/content_exception_editor.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/content_exception_editor.h" #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.h b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.h index 75a0fb1..335bb69 100644 --- a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.h +++ b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.h @@ -13,8 +13,8 @@ #include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "chrome/browser/content_exceptions_table_model.h" -#include "chrome/browser/gtk/gtk_tree.h" -#include "chrome/browser/gtk/options/content_exception_editor.h" +#include "chrome/browser/ui/gtk/gtk_tree.h" +#include "chrome/browser/ui/gtk/options/content_exception_editor.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" diff --git a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk_unittest.cc b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk_unittest.cc index 4e68470..16b8f0c 100644 --- a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/options/content_exceptions_window_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/options/content_exceptions_window_gtk.h" +#include "chrome/browser/ui/gtk/options/content_exceptions_window_gtk.h" #include "chrome/test/testing_profile.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/gtk/options/content_filter_page_gtk.cc b/chrome/browser/ui/gtk/options/content_filter_page_gtk.cc index d463c2a..4ec5656 100644 --- a/chrome/browser/ui/gtk/options/content_filter_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_filter_page_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/options/content_filter_page_gtk.h" +#include "chrome/browser/ui/gtk/options/content_filter_page_gtk.h" #include "app/l10n_util.h" #include "base/command_line.h" @@ -13,13 +13,13 @@ #include "chrome/browser/plugin_exceptions_table_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/prefs/pref_service.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/gtk/options/content_exceptions_window_gtk.h" -#include "chrome/browser/gtk/options/simple_content_exceptions_window.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification_exceptions_table_model.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/browser/ui/gtk/options/content_exceptions_window_gtk.h" +#include "chrome/browser/ui/gtk/options/simple_content_exceptions_window.h" #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" diff --git a/chrome/browser/ui/gtk/options/content_page_gtk.cc b/chrome/browser/ui/gtk/options/content_page_gtk.cc index 54ad10e..1a3d72e4 100644 --- a/chrome/browser/ui/gtk/options/content_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_page_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/options/content_page_gtk.h" +#include "chrome/browser/ui/gtk/options/content_page_gtk.h" #include <string> @@ -10,18 +10,18 @@ #include "base/command_line.h" #include "base/utf_string_conversions.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_util.h" -#include "chrome/browser/gtk/import_dialog_gtk.h" -#include "chrome/browser/gtk/options/options_layout_gtk.h" -#include "chrome/browser/gtk/options/passwords_exceptions_window_gtk.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.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/import_dialog_gtk.h" +#include "chrome/browser/ui/gtk/options/options_layout_gtk.h" +#include "chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/gtk/options/content_page_gtk.h b/chrome/browser/ui/gtk/options/content_page_gtk.h index 571ab3c..183b7b0 100644 --- a/chrome/browser/ui/gtk/options/content_page_gtk.h +++ b/chrome/browser/ui/gtk/options/content_page_gtk.h @@ -12,9 +12,9 @@ #include "app/gtk_signal.h" #include "chrome/browser/autofill/personal_data_manager.h" -#include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h" #include "chrome/browser/ui/options/options_page_base.h" class Profile; diff --git a/chrome/browser/ui/gtk/options/content_settings_window_gtk.cc b/chrome/browser/ui/gtk/options/content_settings_window_gtk.cc index 03ef51a..d971a23 100644 --- a/chrome/browser/ui/gtk/options/content_settings_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_settings_window_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/options/content_settings_window_gtk.h" +#include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" #include <string> #include "app/l10n_util.h" #include "base/command_line.h" #include "base/message_loop.h" -#include "chrome/browser/gtk/accessible_widget_helper_gtk.h" -#include "chrome/browser/gtk/browser_window_gtk.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.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_tree.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/gtk/options/content_settings_window_gtk.h b/chrome/browser/ui/gtk/options/content_settings_window_gtk.h index 6fe483a..cd50a9f 100644 --- a/chrome/browser/ui/gtk/options/content_settings_window_gtk.h +++ b/chrome/browser/ui/gtk/options/content_settings_window_gtk.h @@ -10,9 +10,9 @@ #include "app/gtk_signal.h" #include "base/scoped_ptr.h" -#include "chrome/browser/gtk/options/cookie_filter_page_gtk.h" -#include "chrome/browser/gtk/options/content_filter_page_gtk.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/gtk/options/content_filter_page_gtk.h" +#include "chrome/browser/ui/gtk/options/cookie_filter_page_gtk.h" #include "chrome/common/content_settings_types.h" class AccessibleWidgetHelper; diff --git a/chrome/browser/ui/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/ui/gtk/options/cookie_filter_page_gtk.cc index e2303c0..42d3f10 100644 --- a/chrome/browser/ui/gtk/options/cookie_filter_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/cookie_filter_page_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/options/cookie_filter_page_gtk.h" +#include "chrome/browser/ui/gtk/options/cookie_filter_page_gtk.h" #include "app/l10n_util.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "chrome/browser/browsing_data_local_storage_helper.h" #include "chrome/browser/content_settings/host_content_settings_map.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/gtk/options/content_exceptions_window_gtk.h" -#include "chrome/browser/gtk/options/cookies_view.h" #include "chrome/browser/profiles/profile.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/browser/ui/gtk/options/content_exceptions_window_gtk.h" +#include "chrome/browser/ui/gtk/options/cookies_view.h" #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/options/cookies_view.cc b/chrome/browser/ui/gtk/options/cookies_view.cc index ccb09c9..b30c960 100644 --- a/chrome/browser/ui/gtk/options/cookies_view.cc +++ b/chrome/browser/ui/gtk/options/cookies_view.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/options/cookies_view.h" +#include "chrome/browser/ui/gtk/options/cookies_view.h" #include <gdk/gdkkeysyms.h> #include <set> @@ -12,8 +12,8 @@ #include "base/message_loop.h" #include "base/string_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/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/options/cookies_view.h b/chrome/browser/ui/gtk/options/cookies_view.h index fd52da2..eac8d95 100644 --- a/chrome/browser/ui/gtk/options/cookies_view.h +++ b/chrome/browser/ui/gtk/options/cookies_view.h @@ -19,8 +19,8 @@ #include "chrome/browser/browsing_data_database_helper.h" #include "chrome/browser/browsing_data_indexed_db_helper.h" #include "chrome/browser/browsing_data_local_storage_helper.h" -#include "chrome/browser/gtk/gtk_chrome_cookie_view.h" -#include "chrome/browser/gtk/gtk_tree.h" +#include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h" +#include "chrome/browser/ui/gtk/gtk_tree.h" #include "net/base/cookie_monster.h" class CookieDisplayGtk; diff --git a/chrome/browser/ui/gtk/options/cookies_view_unittest.cc b/chrome/browser/ui/gtk/options/cookies_view_unittest.cc index 61f70fd..60db7b4 100644 --- a/chrome/browser/ui/gtk/options/cookies_view_unittest.cc +++ b/chrome/browser/ui/gtk/options/cookies_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/options/cookies_view.h" +#include "chrome/browser/ui/gtk/options/cookies_view.h" #include <string> #include <vector> @@ -14,7 +14,7 @@ #include "chrome/browser/mock_browsing_data_database_helper.h" #include "chrome/browser/mock_browsing_data_indexed_db_helper.h" #include "chrome/browser/mock_browsing_data_local_storage_helper.h" -#include "chrome/browser/gtk/gtk_chrome_cookie_view.h" +#include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/test/testing_profile.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc b/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc index e8ce90a..9de3dc1 100644 --- a/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc @@ -8,10 +8,10 @@ #include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/gtk/options/fonts_page_gtk.h" -#include "chrome/browser/gtk/options/languages_page_gtk.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/fonts_page_gtk.h" +#include "chrome/browser/ui/gtk/options/languages_page_gtk.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/options/fonts_page_gtk.cc b/chrome/browser/ui/gtk/options/fonts_page_gtk.cc index f6ef7bc..0c4a133 100644 --- a/chrome/browser/ui/gtk/options/fonts_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/fonts_page_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/options/fonts_page_gtk.h" +#include "chrome/browser/ui/gtk/options/fonts_page_gtk.h" #include <string> @@ -10,9 +10,9 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/default_encoding_combo_model.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/options/options_layout_gtk.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/options_layout_gtk.h" #include "chrome/common/pref_names.h" #include "gfx/font.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/options/general_page_gtk.cc b/chrome/browser/ui/gtk/options/general_page_gtk.cc index c541eab..6f773a6 100644 --- a/chrome/browser/ui/gtk/options/general_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/general_page_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/options/general_page_gtk.h" +#include "chrome/browser/ui/gtk/options/general_page_gtk.h" #include <set> #include <vector> @@ -12,13 +12,6 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/custom_home_pages_table_model.h" -#include "chrome/browser/gtk/accessible_widget_helper_gtk.h" -#include "chrome/browser/gtk/gtk_chrome_link_button.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/keyword_editor_view.h" -#include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" -#include "chrome/browser/gtk/options/options_layout_gtk.h" -#include "chrome/browser/gtk/options/url_picker_dialog_gtk.h" #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -27,6 +20,13 @@ #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/ui/gtk/accessible_widget_helper_gtk.h" +#include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/keyword_editor_view.h" +#include "chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h" +#include "chrome/browser/ui/gtk/options/options_layout_gtk.h" +#include "chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h" #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/gtk/options/general_page_gtk.h b/chrome/browser/ui/gtk/options/general_page_gtk.h index 88492de..059194a 100644 --- a/chrome/browser/ui/gtk/options/general_page_gtk.h +++ b/chrome/browser/ui/gtk/options/general_page_gtk.h @@ -11,12 +11,12 @@ #include <string> #include "app/gtk_signal.h" -#include "chrome/browser/gtk/gtk_tree.h" -#include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/shell_integration.h" +#include "chrome/browser/ui/gtk/gtk_tree.h" +#include "chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h" #include "chrome/browser/ui/options/options_page_base.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/gtk/options/languages_page_gtk.cc b/chrome/browser/ui/gtk/options/languages_page_gtk.cc index 1da7e37..9374bc1 100644 --- a/chrome/browser/ui/gtk/options/languages_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/languages_page_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/options/languages_page_gtk.h" +#include "chrome/browser/ui/gtk/options/languages_page_gtk.h" #include <set> #include <string> @@ -14,10 +14,10 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/language_combobox_model.h" #include "chrome/browser/language_order_table_model.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_common.h" diff --git a/chrome/browser/ui/gtk/options/languages_page_gtk.h b/chrome/browser/ui/gtk/options/languages_page_gtk.h index adecbbb..3aace64 100644 --- a/chrome/browser/ui/gtk/options/languages_page_gtk.h +++ b/chrome/browser/ui/gtk/options/languages_page_gtk.h @@ -20,8 +20,8 @@ #include "app/gtk_signal.h" #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" -#include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/gtk/gtk_tree.h" #include "chrome/browser/ui/options/options_page_base.h" class LanguageComboboxModel; diff --git a/chrome/browser/ui/gtk/options/languages_page_gtk_unittest.cc b/chrome/browser/ui/gtk/options/languages_page_gtk_unittest.cc index f9b1231..7df868f 100644 --- a/chrome/browser/ui/gtk/options/languages_page_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/options/languages_page_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/options/languages_page_gtk.h" +#include "chrome/browser/ui/gtk/options/languages_page_gtk.h" #include <gtk/gtk.h> diff --git a/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.cc b/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.cc index 1ba6765..fefb55b 100644 --- a/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.cc +++ b/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.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/options/managed_prefs_banner_gtk.h" +#include "chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h" #include "app/l10n_util.h" -#include "chrome/browser/gtk/gtk_theme_provider.h" -#include "chrome/browser/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/gtk_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/ui/gtk/options/options_layout_gtk.cc b/chrome/browser/ui/gtk/options/options_layout_gtk.cc index 01007d1..33dbc86 100644 --- a/chrome/browser/ui/gtk/options/options_layout_gtk.cc +++ b/chrome/browser/ui/gtk/options/options_layout_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/options/options_layout_gtk.h" +#include "chrome/browser/ui/gtk/options/options_layout_gtk.h" -#include "chrome/browser/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/gtk_util.h" // If the height of screen is equal or shorter than this, we will use // a more compact option layout. diff --git a/chrome/browser/ui/gtk/options/options_window_gtk.cc b/chrome/browser/ui/gtk/options/options_window_gtk.cc index 1a0bccf..517f953 100644 --- a/chrome/browser/ui/gtk/options/options_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/options_window_gtk.cc @@ -9,16 +9,16 @@ #include "base/scoped_ptr.h" #include "chrome/browser/accessibility_events.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/gtk/accessible_widget_helper_gtk.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/options/advanced_page_gtk.h" -#include "chrome/browser/gtk/options/content_page_gtk.h" -#include "chrome/browser/gtk/options/general_page_gtk.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/advanced_page_gtk.h" +#include "chrome/browser/ui/gtk/options/content_page_gtk.h" +#include "chrome/browser/ui/gtk/options/general_page_gtk.h" #include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc b/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc index 7170bb8..77b6226 100644 --- a/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_exceptions_page_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/options/passwords_exceptions_page_gtk.h" +#include "chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.h" #include <string> #include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/gtk_tree.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/gtk/gtk_tree.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.cc b/chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.cc index 4a0c17c..e81865c 100644 --- a/chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_exceptions_window_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/options/passwords_exceptions_window_gtk.h" +#include "chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.h" #include <gtk/gtk.h> @@ -10,11 +10,11 @@ #include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/browser/gtk/accessible_widget_helper_gtk.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/options/passwords_exceptions_page_gtk.h" -#include "chrome/browser/gtk/options/passwords_page_gtk.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.h" +#include "chrome/browser/ui/gtk/options/passwords_page_gtk.h" #include "chrome/browser/ui/options/options_window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/options/passwords_page_gtk.cc b/chrome/browser/ui/gtk/options/passwords_page_gtk.cc index 03ade51..c18080e 100644 --- a/chrome/browser/ui/gtk/options/passwords_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_page_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/options/passwords_page_gtk.h" +#include "chrome/browser/ui/gtk/options/passwords_page_gtk.h" #include <string> #include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/gtk_tree.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/gtk/gtk_tree.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc index d7abc37..63a38da 100644 --- a/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc +++ b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.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/options/simple_content_exceptions_window.h" +#include "chrome/browser/ui/gtk/options/simple_content_exceptions_window.h" #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/gtk_util.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/options/simple_content_exceptions_window.h b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.h index cedee8b..30a7c83 100644 --- a/chrome/browser/ui/gtk/options/simple_content_exceptions_window.h +++ b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.h @@ -10,8 +10,8 @@ #include "app/gtk_signal.h" #include "base/scoped_ptr.h" -#include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/remove_rows_table_model.h" +#include "chrome/browser/ui/gtk/gtk_tree.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" diff --git a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc index bfcc461..f9a47db 100644 --- a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc @@ -7,14 +7,14 @@ #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/gtk_tree.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/options/url_picker_dialog_gtk.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/possible_url_model.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" +#include "chrome/browser/ui/gtk/gtk_tree.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h" #include "chrome/common/pref_names.h" #include "gfx/gtk_util.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h index fdd55cd..a21242f 100644 --- a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h +++ b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.h @@ -11,8 +11,8 @@ #include "app/gtk_signal.h" #include "base/basictypes.h" #include "base/callback.h" -#include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/ui/gtk/gtk_tree.h" class AccessibleWidgetHelper; class GURL; diff --git a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc b/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc index 5c6211d..198a82a 100644 --- a/chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc +++ b/chrome/browser/ui/gtk/status_icons/status_icon_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/status_icons/status_icon_gtk.h" +#include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" #include "base/string16.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/menu_gtk.h" +#include "chrome/browser/ui/gtk/menu_gtk.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk.cc b/chrome/browser/ui/gtk/status_icons/status_tray_gtk.cc index 6412af0..04bc250 100644 --- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk.cc +++ b/chrome/browser/ui/gtk/status_icons/status_tray_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/status_icons/status_tray_gtk.h" +#include "chrome/browser/ui/gtk/status_icons/status_tray_gtk.h" -#include "chrome/browser/gtk/status_icons/status_icon_gtk.h" +#include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" StatusTrayGtk::StatusTrayGtk() { } diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc index 3b2b373..024a616 100644 --- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc @@ -5,8 +5,8 @@ #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/status_icons/status_icon_gtk.h" -#include "chrome/browser/gtk/status_icons/status_tray_gtk.h" +#include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h" +#include "chrome/browser/ui/gtk/status_icons/status_tray_gtk.h" #include "grit/browser_resources.h" #include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc index 8b8631a..ddceec8 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_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/tabs/dragged_tab_controller_gtk.h" +#include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h" #include <algorithm> #include "base/callback.h" -#include "chrome/browser/gtk/browser_window_gtk.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/tabs/dragged_tab_gtk.h" -#include "chrome/browser/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/gtk/browser_window_gtk.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_source.h" diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.cc index 3fbeefd..19c2b6f 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_tab_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/dragged_tab_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/tabs/dragged_tab_gtk.h" +#include "chrome/browser/ui/gtk/tabs/dragged_tab_gtk.h" #include <gdk/gdk.h> @@ -10,14 +10,14 @@ #include "app/x11_util.h" #include "base/i18n/rtl.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/tabs/tab_renderer_gtk.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/backing_store_x.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_gtk.cc index 764b136..13f788c 100644 --- a/chrome/browser/ui/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_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/tabs/tab_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_gtk.h" #include <gdk/gdkkeysyms.h> @@ -10,8 +10,8 @@ #include "base/singleton.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/gtk/accelerators_gtk.h" -#include "chrome/browser/gtk/menu_gtk.h" +#include "chrome/browser/ui/gtk/accelerators_gtk.h" +#include "chrome/browser/ui/gtk/menu_gtk.h" #include "chrome/browser/ui/tabs/tab_menu_model.h" #include "gfx/path.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_gtk.h b/chrome/browser/ui/gtk/tabs/tab_gtk.h index 27078ca..63841f5 100644 --- a/chrome/browser/ui/gtk/tabs/tab_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_gtk.h @@ -9,8 +9,8 @@ #include "app/gtk_signal.h" #include "base/basictypes.h" #include "base/message_loop.h" -#include "chrome/browser/gtk/tabs/tab_renderer_gtk.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" namespace gfx { class Path; diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index 7811700..dc23b31 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_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/tabs/tab_renderer_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" #include <algorithm> #include <utility> @@ -11,13 +11,13 @@ #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/gtk/bookmark_utils_gtk.h" -#include "chrome/browser/gtk/custom_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/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" +#include "chrome/browser/ui/gtk/custom_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/canvas_skia_paint.h" #include "gfx/favicon_size.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h index a5bffa4..7d0b6d1 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/string16.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/canvas.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc index 4ad8af66..6f6ae2c 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_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/tabs/tab_renderer_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index 4bf2b85..b366334 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_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/tabs/tab_strip_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" #include <algorithm> @@ -14,17 +14,17 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_match.h" -#include "chrome/browser/gtk/browser_window_gtk.h" -#include "chrome/browser/gtk/custom_button.h" -#include "chrome/browser/gtk/gtk_theme_provider.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model_delegate.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/gtk/browser_window_gtk.h" +#include "chrome/browser/ui/gtk/custom_button.h" +#include "chrome/browser/ui/gtk/gtk_theme_provider.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h index d6dfe70..af42202 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h @@ -13,11 +13,11 @@ #include "base/basictypes.h" #include "base/task.h" #include "base/message_loop.h" -#include "chrome/browser/gtk/owned_widget_gtk.h" -#include "chrome/browser/gtk/tabstrip_origin_provider.h" -#include "chrome/browser/gtk/tabs/tab_gtk.h" -#include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/gtk/owned_widget_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_gtk.h" +#include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" +#include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/common/notification_observer.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.cc b/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.cc index 25dcdd9..609249b 100644 --- a/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/translate/after_translate_infobar_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/translate/after_translate_infobar_gtk.h" +#include "chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h" #include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/translate/translate_infobar_delegate.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" AfterTranslateInfoBar::AfterTranslateInfoBar( diff --git a/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h b/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h index 61bb9d2..201a4c0 100644 --- a/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h +++ b/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h @@ -7,7 +7,7 @@ #pragma once #include "base/task.h" -#include "chrome/browser/gtk/translate/translate_infobar_base_gtk.h" +#include "chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h" class TranslateInfoBarDelegate; diff --git a/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.cc b/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.cc index 1e11263..7f727fc 100644 --- a/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/translate/before_translate_infobar_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/translate/before_translate_infobar_gtk.h" +#include "chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/translate/translate_infobar_delegate.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" BeforeTranslateInfoBar::BeforeTranslateInfoBar( diff --git a/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h b/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h index d6db052..e15a1b1 100644 --- a/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h +++ b/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_GTK_TRANSLATE_BEFORE_TRANSLATE_INFOBAR_GTK_H_ #pragma once -#include "chrome/browser/gtk/translate/translate_infobar_base_gtk.h" +#include "chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h" class TranslateInfoBarDelegate; diff --git a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc b/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc index 6ee6240..bfca4d4 100644 --- a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc +++ b/chrome/browser/ui/gtk/translate/translate_infobar_base_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/translate/translate_infobar_base_gtk.h" +#include "chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" -#include "chrome/browser/gtk/translate/after_translate_infobar_gtk.h" -#include "chrome/browser/gtk/translate/before_translate_infobar_gtk.h" -#include "chrome/browser/gtk/translate/translate_message_infobar_gtk.h" -#include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/gtk/menu_gtk.h" +#include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/browser/ui/gtk/menu_gtk.h" +#include "chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h" +#include "chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h" +#include "chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h b/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h index 0027d25..a76ebfb 100644 --- a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h +++ b/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/translate/translate_infobar_view.h" -#include "chrome/browser/gtk/infobar_gtk.h" +#include "chrome/browser/ui/gtk/infobar_gtk.h" #include "ui/base/animation/animation_delegate.h" class MenuGtk; diff --git a/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.cc b/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.cc index 74659a9..b2704ae 100644 --- a/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.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/translate/translate_message_infobar_gtk.h" +#include "chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/translate/translate_infobar_delegate.h" +#include "chrome/browser/ui/gtk/gtk_util.h" TranslateMessageInfoBar::TranslateMessageInfoBar( TranslateInfoBarDelegate* delegate) diff --git a/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h b/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h index 725e24f..efb39ec 100644 --- a/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h +++ b/chrome/browser/ui/gtk/translate/translate_message_infobar_gtk.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_GTK_TRANSLATE_TRANSLATE_MESSAGE_INFOBAR_GTK_H_ #pragma once -#include "chrome/browser/gtk/translate/translate_infobar_base_gtk.h" +#include "chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h" class TranslateInfoBarDelegate; diff --git a/chrome/browser/ui/tabs/dock_info.cc b/chrome/browser/ui/tabs/dock_info.cc index 4fe732a7..b7a6997 100644 --- a/chrome/browser/ui/tabs/dock_info.cc +++ b/chrome/browser/ui/tabs/dock_info.cc @@ -7,7 +7,7 @@ #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/tabs/tab.h" #else -#include "chrome/browser/gtk/tabs/tab_gtk.h" +#include "chrome/browser/ui/gtk/tabs/tab_gtk.h" #endif namespace { diff --git a/chrome/browser/ui/views/dialog_stubs_gtk.cc b/chrome/browser/ui/views/dialog_stubs_gtk.cc index 4dd0150..80890b8 100644 --- a/chrome/browser/ui/views/dialog_stubs_gtk.cc +++ b/chrome/browser/ui/views/dialog_stubs_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. @@ -8,17 +8,17 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "chrome/browser/gtk/about_chrome_dialog.h" #include "chrome/browser/fonts_languages_window.h" -#include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" -#include "chrome/browser/gtk/collected_cookies_gtk.h" -#include "chrome/browser/gtk/edit_search_engine_dialog.h" -#include "chrome/browser/gtk/keyword_editor_view.h" -#include "chrome/browser/gtk/options/content_settings_window_gtk.h" -#include "chrome/browser/gtk/options/passwords_exceptions_window_gtk.h" -#include "chrome/browser/gtk/repost_form_warning_gtk.h" -#include "chrome/browser/gtk/task_manager_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/ui/gtk/about_chrome_dialog.h" +#include "chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.h" +#include "chrome/browser/ui/gtk/collected_cookies_gtk.h" +#include "chrome/browser/ui/gtk/edit_search_engine_dialog.h" +#include "chrome/browser/ui/gtk/keyword_editor_view.h" +#include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" +#include "chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.h" +#include "chrome/browser/ui/gtk/repost_form_warning_gtk.h" +#include "chrome/browser/ui/gtk/task_manager_gtk.h" #include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/views/browser_dialogs.h" #include "views/widget/widget.h" |