diff options
20 files changed, 23 insertions, 21 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index c69593b..77ce707 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -49,6 +49,7 @@ 'gfx/gtk_util.h', 'gtk_dnd_util.cc', 'gtk_dnd_util.h', + 'gtk_signal.h', 'gtk_util.cc', 'gtk_util.h', ], @@ -160,6 +161,7 @@ 'gfx/text_elider.h', 'gtk_dnd_util.cc', 'gtk_dnd_util.h', + 'gtk_signal.h', 'gtk_util.cc', 'gtk_util.h', 'l10n_util.cc', diff --git a/chrome/common/gtk_signal.h b/app/gtk_signal.h index 0f93c4f..e56c75d 100644 --- a/chrome/common/gtk_signal.h +++ b/app/gtk_signal.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_GTK_SIGNAL_H_ -#define CHROME_COMMON_GTK_SIGNAL_H_ +#ifndef APP_GTK_SIGNAL_H_ +#define APP_GTK_SIGNAL_H_ typedef void* gpointer; typedef struct _GtkWidget GtkWidget; @@ -88,4 +88,4 @@ typedef struct _GtkWidget GtkWidget; RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three, \ ARG4 four, ARG5 five, ARG6 six); -#endif // CHROME_COMMON_GTK_SIGNAL_H_ +#endif // APP_GTK_SIGNAL_H_ diff --git a/chrome/browser/gtk/back_forward_button_gtk.h b/chrome/browser/gtk/back_forward_button_gtk.h index 7138ecf..3439a75 100644 --- a/chrome/browser/gtk/back_forward_button_gtk.h +++ b/chrome/browser/gtk/back_forward_button_gtk.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_GTK_BACK_FORWARD_BUTTON_GTK_H_ #define CHROME_BROWSER_GTK_BACK_FORWARD_BUTTON_GTK_H_ +#include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/menu_gtk.h" -#include "chrome/common/gtk_signal.h" class BackForwardMenuModel; class Browser; diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h index 5e2d048..5a6ad93 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.h +++ b/chrome/browser/gtk/bookmark_bar_gtk.h @@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "app/gtk_signal.h" #include "app/slide_animation.h" #include "base/gfx/size.h" #include "base/scoped_ptr.h" @@ -19,7 +20,6 @@ #include "chrome/browser/gtk/menu_bar_helper.h" #include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/common/gtk_signal.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/owned_widget_gtk.h" diff --git a/chrome/browser/gtk/bookmark_bar_instructions_gtk.h b/chrome/browser/gtk/bookmark_bar_instructions_gtk.h index d8d2e49..bb7dc12 100644 --- a/chrome/browser/gtk/bookmark_bar_instructions_gtk.h +++ b/chrome/browser/gtk/bookmark_bar_instructions_gtk.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_GTK_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_ #define CHROME_BROWSER_GTK_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_ +#include "app/gtk_signal.h" #include "base/basictypes.h" -#include "chrome/common/gtk_signal.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.h b/chrome/browser/gtk/bookmark_bubble_gtk.h index 8e9424f..6d26e16 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.h +++ b/chrome/browser/gtk/bookmark_bubble_gtk.h @@ -17,10 +17,10 @@ #include <string> #include <vector> +#include "app/gtk_signal.h" #include "base/basictypes.h" #include "base/task.h" #include "chrome/browser/gtk/info_bubble_gtk.h" -#include "chrome/common/gtk_signal.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/gtk/bookmark_editor_gtk.h b/chrome/browser/gtk/bookmark_editor_gtk.h index 671bc6d..8d25862 100644 --- a/chrome/browser/gtk/bookmark_editor_gtk.h +++ b/chrome/browser/gtk/bookmark_editor_gtk.h @@ -9,10 +9,10 @@ #include <string> +#include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" -#include "chrome/common/gtk_signal.h" #include "testing/gtest/include/gtest/gtest_prod.h" class GURL; diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.h b/chrome/browser/gtk/browser_actions_toolbar_gtk.h index 2e03897..6ef7d0a 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.h +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.h @@ -10,6 +10,7 @@ #include <map> #include <string> +#include "app/gtk_signal.h" #include "base/linked_ptr.h" #include "base/task.h" #include "chrome/browser/extensions/extension_toolbar_model.h" @@ -17,7 +18,6 @@ #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/owned_widget_gtk.h" -#include "chrome/common/gtk_signal.h" class Browser; class BrowserActionButton; diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h index aab7041..1ece0db 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/gtk/browser_toolbar_gtk.h @@ -8,6 +8,7 @@ #include <gtk/gtk.h> #include <string> +#include "app/gtk_signal.h" #include "app/menus/simple_menu_model.h" #include "base/scoped_ptr.h" #include "chrome/browser/app_menu_model.h" @@ -18,7 +19,6 @@ #include "chrome/browser/page_menu_model.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/common/gtk_signal.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/owned_widget_gtk.h" diff --git a/chrome/browser/gtk/download_in_progress_dialog_gtk.h b/chrome/browser/gtk/download_in_progress_dialog_gtk.h index 21c0eef..92532f3 100644 --- a/chrome/browser/gtk/download_in_progress_dialog_gtk.h +++ b/chrome/browser/gtk/download_in_progress_dialog_gtk.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_GTK_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_ #define CHROME_BROWSER_GTK_DOWNLOAD_IN_PROGRESS_DIALOG_GTK_H_ +#include "app/gtk_signal.h" #include "base/basictypes.h" -#include "chrome/common/gtk_signal.h" class Browser; diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index edb9256..d585ed5 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -7,6 +7,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include "app/gtk_signal.h" #include "app/gtk_util.h" #include "app/l10n_util.h" #include "base/basictypes.h" @@ -33,7 +34,6 @@ #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/gtk_signal.h" #include "chrome/common/pref_names.h" #include "chrome/common/process_watcher.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/options/advanced_page_gtk.h b/chrome/browser/gtk/options/advanced_page_gtk.h index 25c7d51..a12cdf6 100644 --- a/chrome/browser/gtk/options/advanced_page_gtk.h +++ b/chrome/browser/gtk/options/advanced_page_gtk.h @@ -7,10 +7,10 @@ #include <gtk/gtk.h> +#include "app/gtk_signal.h" #include "chrome/browser/gtk/options/advanced_contents_gtk.h" #include "chrome/browser/options_page_base.h" #include "chrome/browser/pref_member.h" -#include "chrome/common/gtk_signal.h" class Profile; diff --git a/chrome/browser/gtk/options/content_exception_editor.h b/chrome/browser/gtk/options/content_exception_editor.h index 0d4b4ff..405240c 100644 --- a/chrome/browser/gtk/options/content_exception_editor.h +++ b/chrome/browser/gtk/options/content_exception_editor.h @@ -9,11 +9,11 @@ #include <string> +#include "app/gtk_signal.h" #include "chrome/browser/content_exceptions_table_model.h" #include "chrome/browser/content_setting_combo_model.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/gtk_signal.h" // An editor which lets the user create or edit an individual exception to the // current content setting policy. (i.e. let www.google.com always show diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.h b/chrome/browser/gtk/options/content_exceptions_window_gtk.h index 86983ef..1037baa 100644 --- a/chrome/browser/gtk/options/content_exceptions_window_gtk.h +++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.h @@ -9,13 +9,13 @@ #include <string> +#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/common/content_settings.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/gtk_signal.h" class HostContentSettingsMap; diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.h b/chrome/browser/gtk/options/content_filter_page_gtk.h index 7d83ab5..fe562b4c 100644 --- a/chrome/browser/gtk/options/content_filter_page_gtk.h +++ b/chrome/browser/gtk/options/content_filter_page_gtk.h @@ -9,9 +9,9 @@ #include <string> +#include "app/gtk_signal.h" #include "chrome/browser/options_page_base.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/gtk_signal.h" // A page in the content settings window. Used for everything but the Cookies // page (which has a much more complex dialog). A |content_type| is passed into diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h index 2523efd..5f328d3 100644 --- a/chrome/browser/gtk/options/content_page_gtk.h +++ b/chrome/browser/gtk/options/content_page_gtk.h @@ -7,12 +7,12 @@ #include <gtk/gtk.h> +#include "app/gtk_signal.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/options_page_base.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/common/gtk_signal.h" class ContentPageGtk : public OptionsPageBase, public ProfileSyncServiceObserver, diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.h b/chrome/browser/gtk/options/content_settings_window_gtk.h index 36eede6..c622e51 100644 --- a/chrome/browser/gtk/options/content_settings_window_gtk.h +++ b/chrome/browser/gtk/options/content_settings_window_gtk.h @@ -7,12 +7,12 @@ #include <gtk/gtk.h> +#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/pref_member.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/gtk_signal.h" class AccessibleWidgetHelper; diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.h b/chrome/browser/gtk/options/cookie_filter_page_gtk.h index 8d957f5..3eb6bb1 100644 --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.h +++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.h @@ -9,9 +9,9 @@ #include <string> +#include "app/gtk_signal.h" #include "chrome/browser/options_page_base.h" #include "chrome/browser/pref_member.h" -#include "chrome/common/gtk_signal.h" class Profile; diff --git a/chrome/browser/gtk/options/cookies_view.h b/chrome/browser/gtk/options/cookies_view.h index 7341d2b..84465c4 100644 --- a/chrome/browser/gtk/options/cookies_view.h +++ b/chrome/browser/gtk/options/cookies_view.h @@ -9,6 +9,7 @@ #include <gtk/gtk.h> +#include "app/gtk_signal.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/task.h" @@ -17,7 +18,6 @@ #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/common/gtk_signal.h" #include "net/base/cookie_monster.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/chrome/browser/gtk/translate_infobars.h b/chrome/browser/gtk/translate_infobars.h index 56f69c2..4bd752f 100644 --- a/chrome/browser/gtk/translate_infobars.h +++ b/chrome/browser/gtk/translate_infobars.h @@ -7,11 +7,11 @@ #include <gtk/gtk.h> +#include "app/gtk_signal.h" #include "app/menus/simple_menu_model.h" #include "chrome/browser/gtk/infobar_gtk.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/translate/translate_infobars_delegates.h" -#include "chrome/common/gtk_signal.h" #include "chrome/common/notification_registrar.h" class OptionsMenuModel; |