diff options
Diffstat (limited to 'chrome/browser')
89 files changed, 147 insertions, 112 deletions
diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc index 83fe84d..35cf188 100644 --- a/chrome/browser/accessibility/accessibility_extension_api.cc +++ b/chrome/browser/accessibility/accessibility_extension_api.cc @@ -8,13 +8,13 @@ #include "base/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/accessibility/accessibility_extension_api_constants.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_tab_util.h" -#include "chrome/browser/infobars/infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_error_utils.h" diff --git a/chrome/browser/accessibility/accessibility_extension_apitest.cc b/chrome/browser/accessibility/accessibility_extension_apitest.cc index 0dc9aba..29cfb54 100644 --- a/chrome/browser/accessibility/accessibility_extension_apitest.cc +++ b/chrome/browser/accessibility/accessibility_extension_apitest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 3bf0e60..9ad01af 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -5,10 +5,10 @@ #include "chrome/browser/alternate_nav_url_fetcher.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/api/DEPS b/chrome/browser/api/DEPS new file mode 100644 index 0000000..90c085b --- /dev/null +++ b/chrome/browser/api/DEPS @@ -0,0 +1,29 @@ +# The chrome/browser/api directory is for programming interfaces +# provided by Chrome to Browser Components that run within Chrome. +# Files here are not allowed to include stuff under chrome/browser +# since that would leak implementation details to users of the APIs. +# +# APIs can be either pure-virtual to allow specialization at runtime, +# or they can be non-virtual and specialized per platform (or +# otherwise at compile time), or a mix of non-virtual and virtual. +# The primary initial objective is to break Browser Components' +# dependencies on implementation details, so non-virtual classes in +# header files that do not expose any headers from chrome/browser +# except for chrome/browser/api are acceptable. +# +# Note that for non-virtual APIs, there is an increased risk of an +# implicit link-time dependency remaining from the user of the API to +# the implementation. We are accepting this risk initially, but plan +# to write a new type of link-time or target-level set of dependency +# rules to help us find such problems and reduce them over time. +# +# The directory structure under chrome/browser/api/ is a mirror of +# those parts of the chrome/browser/ structure that APIs have been +# extracted from. Hence, an API defined in chrome/browser/api/x/y/z +# is likely to be implemented in a directory chrome/browser/x/y/z. +# +# See http://www.chromium.org/developers/design-documents/browser-components +include_rules = [ + "-chrome/browser", + "+chrome/browser/api", +] diff --git a/chrome/browser/api/OWNERS b/chrome/browser/api/OWNERS new file mode 100644 index 0000000..4975363 --- /dev/null +++ b/chrome/browser/api/OWNERS @@ -0,0 +1 @@ +joi@chromium.org diff --git a/chrome/browser/api/infobars/DEPS b/chrome/browser/api/infobars/DEPS new file mode 100644 index 0000000..eeb53ad --- /dev/null +++ b/chrome/browser/api/infobars/DEPS @@ -0,0 +1,6 @@ +include_rules = [ + # TODO(joi): Reduce this list to zero exceptions. + + # This looks reasonably easy to break; used by infobar_delegate.h/.cc + "!chrome/browser/infobars/infobar_tab_helper.h", +] diff --git a/chrome/browser/api/infobars/OWNERS b/chrome/browser/api/infobars/OWNERS new file mode 100644 index 0000000..bf426d6 --- /dev/null +++ b/chrome/browser/api/infobars/OWNERS @@ -0,0 +1 @@ +pkasting@chromium.org diff --git a/chrome/browser/tab_contents/confirm_infobar_delegate.cc b/chrome/browser/api/infobars/confirm_infobar_delegate.cc index 226bd64..2944466 100644 --- a/chrome/browser/tab_contents/confirm_infobar_delegate.cc +++ b/chrome/browser/api/infobars/confirm_infobar_delegate.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/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "content/public/browser/navigation_details.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/tab_contents/confirm_infobar_delegate.h b/chrome/browser/api/infobars/confirm_infobar_delegate.h index cf95bcc..e793bd7 100644 --- a/chrome/browser/tab_contents/confirm_infobar_delegate.h +++ b/chrome/browser/api/infobars/confirm_infobar_delegate.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_TAB_CONTENTS_CONFIRM_INFOBAR_DELEGATE_H_ -#define CHROME_BROWSER_TAB_CONTENTS_CONFIRM_INFOBAR_DELEGATE_H_ +#ifndef CHROME_BROWSER_API_INFOBARS_CONFIRM_INFOBAR_DELEGATE_H_ +#define CHROME_BROWSER_API_INFOBARS_CONFIRM_INFOBAR_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" // An interface derived from InfoBarDelegate implemented by objects wishing to // control a ConfirmInfoBar. @@ -73,4 +73,4 @@ class ConfirmInfoBarDelegate : public InfoBarDelegate { DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBarDelegate); }; -#endif // CHROME_BROWSER_TAB_CONTENTS_CONFIRM_INFOBAR_DELEGATE_H_ +#endif // CHROME_BROWSER_API_INFOBARS_CONFIRM_INFOBAR_DELEGATE_H_ diff --git a/chrome/browser/infobars/infobar_delegate.cc b/chrome/browser/api/infobars/infobar_delegate.cc index 7ebce64..69f6625 100644 --- a/chrome/browser/infobars/infobar_delegate.cc +++ b/chrome/browser/api/infobars/infobar_delegate.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/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "base/logging.h" #include "build/build_config.h" diff --git a/chrome/browser/infobars/infobar_delegate.h b/chrome/browser/api/infobars/infobar_delegate.h index 5e442ae..26b2438 100644 --- a/chrome/browser/infobars/infobar_delegate.h +++ b/chrome/browser/api/infobars/infobar_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_INFOBARS_INFOBAR_DELEGATE_H_ -#define CHROME_BROWSER_INFOBARS_INFOBAR_DELEGATE_H_ +#ifndef CHROME_BROWSER_API_INFOBARS_INFOBAR_DELEGATE_H_ +#define CHROME_BROWSER_API_INFOBARS_INFOBAR_DELEGATE_H_ #include "base/basictypes.h" #include "base/string16.h" @@ -143,4 +143,4 @@ class InfoBarDelegate { DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate); }; -#endif // CHROME_BROWSER_INFOBARS_INFOBAR_DELEGATE_H_ +#endif // CHROME_BROWSER_API_INFOBARS_INFOBAR_DELEGATE_H_ diff --git a/chrome/browser/tab_contents/link_infobar_delegate.cc b/chrome/browser/api/infobars/link_infobar_delegate.cc index 02c2c2e..340945c 100644 --- a/chrome/browser/tab_contents/link_infobar_delegate.cc +++ b/chrome/browser/api/infobars/link_infobar_delegate.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/tab_contents/link_infobar_delegate.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" bool LinkInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { return true; diff --git a/chrome/browser/tab_contents/link_infobar_delegate.h b/chrome/browser/api/infobars/link_infobar_delegate.h index ab7cbf6..0856115 100644 --- a/chrome/browser/tab_contents/link_infobar_delegate.h +++ b/chrome/browser/api/infobars/link_infobar_delegate.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_TAB_CONTENTS_LINK_INFOBAR_DELEGATE_H_ -#define CHROME_BROWSER_TAB_CONTENTS_LINK_INFOBAR_DELEGATE_H_ +#ifndef CHROME_BROWSER_API_INFOBARS_LINK_INFOBAR_DELEGATE_H_ +#define CHROME_BROWSER_API_INFOBARS_LINK_INFOBAR_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" class InfoBarTabHelper; @@ -42,4 +42,5 @@ class LinkInfoBarDelegate : public InfoBarDelegate { DISALLOW_COPY_AND_ASSIGN(LinkInfoBarDelegate); }; -#endif // CHROME_BROWSER_TAB_CONTENTS_LINK_INFOBAR_DELEGATE_H_ +#endif // CHROME_BROWSER_API_INFOBARS_LINK_INFOBAR_DELEGATE_H_ + diff --git a/chrome/browser/tab_contents/simple_alert_infobar_delegate.cc b/chrome/browser/api/infobars/simple_alert_infobar_delegate.cc index bc7008e..69c18ba 100644 --- a/chrome/browser/tab_contents/simple_alert_infobar_delegate.cc +++ b/chrome/browser/api/infobars/simple_alert_infobar_delegate.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/tab_contents/simple_alert_infobar_delegate.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/tab_contents/simple_alert_infobar_delegate.h b/chrome/browser/api/infobars/simple_alert_infobar_delegate.h index b025753..c1f8fc3 100644 --- a/chrome/browser/tab_contents/simple_alert_infobar_delegate.h +++ b/chrome/browser/api/infobars/simple_alert_infobar_delegate.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_TAB_CONTENTS_SIMPLE_ALERT_INFOBAR_DELEGATE_H_ -#define CHROME_BROWSER_TAB_CONTENTS_SIMPLE_ALERT_INFOBAR_DELEGATE_H_ +#ifndef CHROME_BROWSER_API_INFOBARS_SIMPLE_ALERT_INFOBAR_DELEGATE_H_ +#define CHROME_BROWSER_API_INFOBARS_SIMPLE_ALERT_INFOBAR_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate { public: @@ -34,4 +34,4 @@ class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate { DISALLOW_COPY_AND_ASSIGN(SimpleAlertInfoBarDelegate); }; -#endif // CHROME_BROWSER_TAB_CONTENTS_SIMPLE_ALERT_INFOBAR_DELEGATE_H_ +#endif // CHROME_BROWSER_API_INFOBARS_SIMPLE_ALERT_INFOBAR_DELEGATE_H_ diff --git a/chrome/browser/autofill/DEPS b/chrome/browser/autofill/DEPS index 90d0a22..5af13ce 100644 --- a/chrome/browser/autofill/DEPS +++ b/chrome/browser/autofill/DEPS @@ -10,7 +10,6 @@ include_rules = [ # # Do not add to the list of temporarily-allowed dependencies below, # and please do not introduce more #includes of these files. - "!chrome/browser/feedback/proto/extension.pb.h", "!chrome/browser/infobars/infobar_tab_helper.h", "!chrome/browser/password_manager/encryptor.h", "!chrome/browser/password_manager/password_manager.h", @@ -24,8 +23,6 @@ include_rules = [ "!chrome/browser/sync/profile_sync_service.h", "!chrome/browser/sync/profile_sync_service_factory.h", "!chrome/browser/sync/profile_sync_service_observer.h", - "!chrome/browser/tab_contents/confirm_infobar_delegate.h", - "!chrome/browser/tab_contents/link_infobar_delegate.h", "!chrome/browser/translate/translate_infobar_delegate.h", "!chrome/browser/translate/translate_manager.h", "!chrome/browser/ui/browser.h", diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.h b/chrome/browser/autofill/autofill_cc_infobar_delegate.h index 4e406a2..aa4500f 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_delegate.h +++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.h @@ -9,8 +9,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/autofill/autofill_metrics.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "webkit/glue/window_open_disposition.h" class CreditCard; diff --git a/chrome/browser/autofill/autofill_country.cc b/chrome/browser/autofill/autofill_country.cc index ff12e29..03b1fef 100644 --- a/chrome/browser/autofill/autofill_country.cc +++ b/chrome/browser/autofill/autofill_country.cc @@ -4,9 +4,9 @@ #include "chrome/browser/autofill/autofill_country.h" -#include <map> #include <stddef.h> #include <stdint.h> +#include <map> #include <utility> #include "base/logging.h" @@ -15,8 +15,8 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/public/browser/content_browser_client.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/content_browser_client.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "unicode/coll.h" diff --git a/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc b/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc index f152166..2b72d3e 100644 --- a/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc +++ b/chrome/browser/autofill/autofill_feedback_infobar_delegate.cc @@ -5,7 +5,6 @@ #include "chrome/browser/autofill/autofill_feedback_infobar_delegate.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/feedback/proto/extension.pb.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/autofill/autofill_feedback_infobar_delegate.h b/chrome/browser/autofill/autofill_feedback_infobar_delegate.h index 2453807..53a0e9c 100644 --- a/chrome/browser/autofill/autofill_feedback_infobar_delegate.h +++ b/chrome/browser/autofill/autofill_feedback_infobar_delegate.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" #include "webkit/glue/window_open_disposition.h" // An InfoBar delegate that prompts the user to provide additional feedback for diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index f640114..1c9d97d 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -23,6 +23,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_json.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -51,7 +52,6 @@ #include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/browser/translate/page_translated_details.h" #include "chrome/browser/translate/translate_infobar_delegate.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 4114001..86a4a49 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -24,6 +24,8 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_result.h" @@ -91,8 +93,6 @@ #include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/translate/translate_infobar_delegate.h" diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc index 631a00e..8c7c6d5 100644 --- a/chrome/browser/chrome_quota_permission_context.cc +++ b/chrome/browser/chrome_quota_permission_context.cc @@ -8,10 +8,10 @@ #include "base/bind.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h index 7b651f3..24c4c28 100644 --- a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h +++ b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CUSTOM_HANDLERS_REGISTER_PROTOCOL_HANDLER_INFOBAR_DELEGATE_H_ #include "base/string16.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/common/custom_handlers/protocol_handler.h" class ProtocolHandlerRegistry; diff --git a/chrome/browser/download/download_request_infobar_delegate.h b/chrome/browser/download/download_request_infobar_delegate.h index 74c11e1..0e8f2fe 100644 --- a/chrome/browser/download/download_request_infobar_delegate.h +++ b/chrome/browser/download/download_request_infobar_delegate.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_INFOBAR_DELEGATE_H_ #include "base/basictypes.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/download/download_request_limiter.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" // An infobar delegate that presents the user with a choice to allow or deny // multiple downloads from the same site. This confirmation step protects diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index c24dc92..e2330f8 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -16,13 +16,13 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/extensions/api/debugger/debugger_api_constants.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/app_notify_channel_ui_impl.cc b/chrome/browser/extensions/app_notify_channel_ui_impl.cc index e480300..38b2b4b 100644 --- a/chrome/browser/extensions/app_notify_channel_ui_impl.cc +++ b/chrome/browser/extensions/app_notify_channel_ui_impl.cc @@ -5,13 +5,13 @@ #include "chrome/browser/extensions/app_notify_channel_ui_impl.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" @@ -22,8 +22,8 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_infobar_delegate.h b/chrome/browser/extensions/extension_infobar_delegate.h index edf2f59..c843623 100644 --- a/chrome/browser/extensions/extension_infobar_delegate.h +++ b/chrome/browser/extensions/extension_infobar_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INFOBAR_DELEGATE_H_ #include "base/memory/scoped_ptr.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index 92c57b8..0e50725 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc @@ -8,12 +8,12 @@ #include "chrome/browser/extensions/theme_installed_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" -#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/extensions/extension_install_ui_default.cc b/chrome/browser/extensions/extension_install_ui_default.cc index 41eb7fe..d4b940a 100644 --- a/chrome/browser/extensions/extension_install_ui_default.cc +++ b/chrome/browser/extensions/extension_install_ui_default.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/theme_installed_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h index a45b5c5..a3abb17 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.h +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 9393be8..5d84bef 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/extensions/extension_service.h" @@ -18,7 +19,6 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/view_type_utils.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index e6d7734..186911a 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -10,12 +10,12 @@ #include "base/hash_tables.h" #include "base/memory/scoped_vector.h" #include "base/synchronization/waitable_event.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/test_tab_contents.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index abc35b0..7edf812 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -8,13 +8,13 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/geolocation/geolocation_settings_state.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h index dcbd0ed..21f4a01 100644 --- a/chrome/browser/google/google_url_tracker.h +++ b/chrome/browser/google/google_url_tracker.h @@ -12,8 +12,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/profiles/profile_keyed_service.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc index 3bedc29..10893d7 100644 --- a/chrome/browser/google/google_url_tracker_unittest.cc +++ b/chrome/browser/google/google_url_tracker_unittest.cc @@ -8,8 +8,8 @@ #include <string> #include "base/message_loop.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/google/google_url_tracker_factory.h" -#include "chrome/browser/infobars/infobar_delegate.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/infobars/OWNERS b/chrome/browser/infobars/OWNERS new file mode 100644 index 0000000..bf426d6 --- /dev/null +++ b/chrome/browser/infobars/OWNERS @@ -0,0 +1 @@ +pkasting@chromium.org diff --git a/chrome/browser/infobars/infobar.cc b/chrome/browser/infobars/infobar.cc index 9fb30f5..4ef4ee6 100644 --- a/chrome/browser/infobars/infobar.cc +++ b/chrome/browser/infobars/infobar.cc @@ -6,8 +6,8 @@ #include <cmath> -#include "build/build_config.h" #include "base/logging.h" +#include "build/build_config.h" #include "chrome/browser/infobars/infobar_container.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/infobars/infobar.h b/chrome/browser/infobars/infobar.h index 67f6a5f..bf2a626 100644 --- a/chrome/browser/infobars/infobar.h +++ b/chrome/browser/infobars/infobar.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "build/build_config.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/infobars/infobar_container.cc b/chrome/browser/infobars/infobar_container.cc index 53f2ccd..527e99c 100644 --- a/chrome/browser/infobars/infobar_container.cc +++ b/chrome/browser/infobars/infobar_container.cc @@ -12,8 +12,8 @@ #include <algorithm> #include "base/logging.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" -#include "chrome/browser/infobars/infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc index ee392a7..4b7f26c 100644 --- a/chrome/browser/infobars/infobar_extension_api.cc +++ b/chrome/browser/infobars/infobar_extension_api.cc @@ -7,13 +7,13 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/values.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/window_controller.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/infobars/infobar_tab_helper.cc b/chrome/browser/infobars/infobar_tab_helper.cc index c567cb7..405661f 100644 --- a/chrome/browser/infobars/infobar_tab_helper.cc +++ b/chrome/browser/infobars/infobar_tab_helper.cc @@ -4,9 +4,9 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" -#include "chrome/browser/infobars/infobar_delegate.h" -#include "chrome/browser/tab_contents/insecure_content_infobar_delegate.h" +#include "chrome/browser/infobars/insecure_content_infobar_delegate.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/render_messages.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index f36f679..5ac1e40 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc @@ -6,6 +6,7 @@ #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/infobars/infobar_tab_helper.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" @@ -13,11 +14,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/browser/profiles/profile.h" -#include "content/public/browser/notification_service.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/ui_test.h" +#include "content/public/browser/notification_service.h" #include "net/test/test_server.h" class InfoBarsTest : public InProcessBrowserTest { diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc b/chrome/browser/infobars/insecure_content_infobar_delegate.cc index 8f82474..1734103 100644 --- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.cc +++ b/chrome/browser/infobars/insecure_content_infobar_delegate.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/tab_contents/insecure_content_infobar_delegate.h" +#include "chrome/browser/infobars/insecure_content_infobar_delegate.h" #include "base/metrics/histogram.h" #include "chrome/browser/google/google_util.h" diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h b/chrome/browser/infobars/insecure_content_infobar_delegate.h index 0e7557b..f199897 100644 --- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h +++ b/chrome/browser/infobars/insecure_content_infobar_delegate.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_TAB_CONTENTS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_ -#define CHROME_BROWSER_TAB_CONTENTS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_ +#ifndef CHROME_BROWSER_INFOBARS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_ +#define CHROME_BROWSER_INFOBARS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_ -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" // Base class for delegates that show warnings on HTTPS pages which try to // display or run insecure content. @@ -51,5 +51,5 @@ class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate { DISALLOW_IMPLICIT_CONSTRUCTORS(InsecureContentInfoBarDelegate); }; -#endif // CHROME_BROWSER_TAB_CONTENTS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_ +#endif // CHROME_BROWSER_INFOBARS_INSECURE_CONTENT_INFOBAR_DELEGATE_H_ diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate.h b/chrome/browser/intents/register_intent_handler_infobar_delegate.h index 28b23de..36cbf28 100644 --- a/chrome/browser/intents/register_intent_handler_infobar_delegate.h +++ b/chrome/browser/intents/register_intent_handler_infobar_delegate.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "webkit/glue/web_intent_service_data.h" class InfoBarTabHelper; diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 600f5af..ca9f82c 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -7,6 +7,7 @@ #include "base/metrics/histogram.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/content_settings_details.h" #include "chrome/browser/content_settings/content_settings_provider.h" @@ -20,7 +21,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/web_ui_util.h" diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index 8dbf7fc8..ae727b8 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -9,6 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/autocomplete/autocomplete_log.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_result.h" @@ -18,7 +19,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc index 603553a..229f0bf 100644 --- a/chrome/browser/password_manager/password_manager_delegate_impl.cc +++ b/chrome/browser/password_manager/password_manager_delegate_impl.cc @@ -7,11 +7,11 @@ #include "base/memory/singleton.h" #include "base/metrics/histogram.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/autofill/autofill_manager.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/sync/one_click_signin_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/autofill_messages.h" diff --git a/chrome/browser/plugin_infobar_delegates.h b/chrome/browser/plugin_infobar_delegates.h index cf9eda3..5bb17d5 100644 --- a/chrome/browser/plugin_infobar_delegates.h +++ b/chrome/browser/plugin_infobar_delegates.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PLUGIN_INFOBAR_DELEGATES_H_ #include "base/callback.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "googleurl/src/gurl.h" #if defined(ENABLE_PLUGIN_INSTALLATION) diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugin_observer.cc index a7c5347..885206b 100644 --- a/chrome/browser/plugin_observer.cc +++ b/chrome/browser/plugin_observer.cc @@ -8,6 +8,8 @@ #include "base/bind.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/infobars/infobar_tab_helper.h" @@ -15,8 +17,6 @@ #include "chrome/browser/plugin_finder.h" #include "chrome/browser/plugin_infobar_delegates.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index 6bbab3f..56d80c4 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -12,6 +12,8 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/infobars/infobar.h" @@ -19,8 +21,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_add_cert_handler.h" #include "chrome/browser/ssl_client_certificate_selector.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index d1747395..986992c 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -6,6 +6,7 @@ #include "base/file_path.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/browser_process.h" @@ -17,7 +18,6 @@ #include "chrome/browser/notifications/notification_test_util.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" diff --git a/chrome/browser/translate/translate_infobar_delegate.h b/chrome/browser/translate/translate_infobar_delegate.h index c7e9d0b..8932f36 100644 --- a/chrome/browser/translate/translate_infobar_delegate.h +++ b/chrome/browser/translate/translate_infobar_delegate.h @@ -10,7 +10,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/translate/translate_prefs.h" #include "chrome/common/translate_errors.h" diff --git a/chrome/browser/ui/android/infobar_stubs.cc b/chrome/browser/ui/android/infobar_stubs.cc index 7eaf6f3..e96e24a 100644 --- a/chrome/browser/ui/android/infobar_stubs.cc +++ b/chrome/browser/ui/android/infobar_stubs.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/logging.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" // Infobars are implemented in Java on Android. diff --git a/chrome/browser/ui/auto_login_info_bar_delegate.cc b/chrome/browser/ui/auto_login_info_bar_delegate.cc index a999eec..68e4a33 100644 --- a/chrome/browser/ui/auto_login_info_bar_delegate.cc +++ b/chrome/browser/ui/auto_login_info_bar_delegate.cc @@ -9,13 +9,13 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/ubertoken_fetcher.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" @@ -24,12 +24,12 @@ #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" -#include "content/public/browser/navigation_controller.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" #include "content/public/common/referrer.h" diff --git a/chrome/browser/ui/auto_login_info_bar_delegate.h b/chrome/browser/ui/auto_login_info_bar_delegate.h index 4c3b586..12ea339 100644 --- a/chrome/browser/ui/auto_login_info_bar_delegate.h +++ b/chrome/browser/ui/auto_login_info_bar_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_AUTO_LOGIN_INFO_BAR_DELEGATE_H_ #define CHROME_BROWSER_UI_AUTO_LOGIN_INFO_BAR_DELEGATE_H_ -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index fa9ef5c..daffdc3 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -28,6 +28,7 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" @@ -88,7 +89,6 @@ #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/tab_contents/background_contents.h" #include "chrome/browser/tab_contents/retargeting_details.h" -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" diff --git a/chrome/browser/ui/chrome_select_file_policy.cc b/chrome/browser/ui/chrome_select_file_policy.cc index 7f1fb44..116b52a 100644 --- a/chrome/browser/ui/chrome_select_file_policy.cc +++ b/chrome/browser/ui/chrome_select_file_policy.cc @@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm index 6dab98e..b11a3b5 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm @@ -6,10 +6,10 @@ #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm index 3770270..940eca0 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm @@ -5,9 +5,9 @@ #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #import "chrome/browser/ui/cocoa/animatable_view.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm index faa3f56..d7b584d 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm @@ -8,9 +8,9 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" #import "chrome/browser/ui/cocoa/animatable_view.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/event_utils.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm index c59ba8f..4c5945c 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm @@ -7,8 +7,8 @@ #include "base/memory/scoped_nsobject.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" diff --git a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h index 01b7ff7..2bca8d9 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h +++ b/chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_GRADIENT_VIEW_H_ #define CHROME_BROWSER_UI_COCOA_INFOBARS_INFOBAR_GRADIENT_VIEW_H_ -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h index aae8a67..46b55a4 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h +++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate { public: diff --git a/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h b/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h index 0d42629..078d6d7 100644 --- a/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h +++ b/chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" class MockLinkInfoBarDelegate : public LinkInfoBarDelegate { public: diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm index 7e6f1dc..7345b25 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm @@ -12,12 +12,12 @@ #include "base/command_line.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #import "chrome/browser/mac/keystone_glue.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" diff --git a/chrome/browser/ui/collected_cookies_infobar_delegate.h b/chrome/browser/ui/collected_cookies_infobar_delegate.h index 71186fc..3493081 100644 --- a/chrome/browser/ui/collected_cookies_infobar_delegate.h +++ b/chrome/browser/ui/collected_cookies_infobar_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_COLLECTED_COOKIES_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_UI_COLLECTED_COOKIES_INFOBAR_DELEGATE_H_ -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" // This class configures an infobar shown when the collected cookies dialog // is closed and the settings for one or more cookies have been changed. The diff --git a/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.h b/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.h index f76ecc0..f5d5d77 100644 --- a/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.h +++ b/chrome/browser/ui/gtk/infobars/confirm_infobar_gtk.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_GTK_INFOBARS_CONFIRM_INFOBAR_GTK_H_ #include "base/basictypes.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc b/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc index 4f24b97..15b235a 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/infobar_container_gtk.cc @@ -9,7 +9,7 @@ #include <utility> #include "base/message_loop.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" diff --git a/chrome/browser/ui/gtk/infobars/infobar_gtk.h b/chrome/browser/ui/gtk/infobars/infobar_gtk.h index db87b4a..bb0afba 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_gtk.h +++ b/chrome/browser/ui/gtk/infobars/infobar_gtk.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" -#include "chrome/browser/infobars/infobar_delegate.h" #include "chrome/browser/ui/gtk/menu_gtk.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/gtk/infobars/link_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/link_infobar_gtk.cc index d0ab366..b64b556 100644 --- a/chrome/browser/ui/gtk/infobars/link_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/link_infobar_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/gtk/infobars/link_infobar_gtk.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" #include "chrome/browser/ui/gtk/event_utils.h" // LinkInfoBarDelegate --------------------------------------------------------- diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc index 3669765..97fdd53 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.cc +++ b/chrome/browser/ui/hung_plugin_tab_helper.cc @@ -7,13 +7,13 @@ #include "base/bind.h" #include "base/process_util.h" #include "build/build_config.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" -#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_child_process_host_iterator.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/media_stream_infobar_delegate.h b/chrome/browser/ui/media_stream_infobar_delegate.h index d0f66e5..c984d77 100644 --- a/chrome/browser/ui/media_stream_infobar_delegate.h +++ b/chrome/browser/ui/media_stream_infobar_delegate.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/media/media_stream_devices_controller.h" // This class configures an infobar shown when a page requests access to a diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index 08d8c40..67f3837 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -8,13 +8,13 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/chrome_plugin_service_filter.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_content_client.h" diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc index 1b7a5a5..c37ae8b 100644 --- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc +++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc @@ -7,12 +7,12 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/auto_launch_trial.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc index 6716fc0..b10e9cc 100644 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc index c4c05b0..22b3341 100644 --- a/chrome/browser/ui/startup/default_browser_prompt.cc +++ b/chrome/browser/ui/startup/default_browser_prompt.cc @@ -7,13 +7,13 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/shell_integration.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/startup/obsolete_os_info_bar.h b/chrome/browser/ui/startup/obsolete_os_info_bar.h index bb66299..8001b75 100644 --- a/chrome/browser/ui/startup/obsolete_os_info_bar.h +++ b/chrome/browser/ui/startup/obsolete_os_info_bar.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" #include "googleurl/src/gurl.h" class InfoBarTabHelper; diff --git a/chrome/browser/ui/startup/session_crashed_prompt.cc b/chrome/browser/ui/startup/session_crashed_prompt.cc index 9e13218..855e4d9 100644 --- a/chrome/browser/ui/startup/session_crashed_prompt.cc +++ b/chrome/browser/ui/startup/session_crashed_prompt.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/startup/session_crashed_prompt.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_restore.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_tabstrip.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index 78dabfb..93d437e 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -9,6 +9,7 @@ #include "base/metrics/histogram.h" #include "base/string_split.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" @@ -19,7 +20,6 @@ #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.cc b/chrome/browser/ui/views/infobars/confirm_infobar.cc index b3c20a4..08ed1c1 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.cc +++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/infobars/confirm_infobar.h" #include "base/logging.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/event_disposition.h" -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" diff --git a/chrome/browser/ui/views/infobars/infobar_background.h b/chrome/browser/ui/views/infobars/infobar_background.h index ba04a88..3c8367f 100644 --- a/chrome/browser/ui/views/infobars/infobar_background.h +++ b/chrome/browser/ui/views/infobars/infobar_background.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_INFOBAR_BACKGROUND_H_ #include "base/compiler_specific.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "ui/views/background.h" class InfoBarBackground : public views::Background { diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 42afa3e..b645b33 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/ui/views/infobars/infobar_background.h" #include "chrome/browser/ui/views/infobars/infobar_button_border.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/infobars/link_infobar.cc b/chrome/browser/ui/views/infobars/link_infobar.cc index 7d64ae9..49a65f4 100644 --- a/chrome/browser/ui/views/infobars/link_infobar.cc +++ b/chrome/browser/ui/views/infobars/link_infobar.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/infobars/link_infobar.h" #include "base/logging.h" +#include "chrome/browser/api/infobars/link_infobar_delegate.h" #include "chrome/browser/event_disposition.h" -#include "chrome/browser/tab_contents/link_infobar_delegate.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" diff --git a/chrome/browser/ui/views/infobars/media_stream_infobar.h b/chrome/browser/ui/views/infobars/media_stream_infobar.h index b0df0aa..4a1c496 100644 --- a/chrome/browser/ui/views/infobars/media_stream_infobar.h +++ b/chrome/browser/ui/views/infobars/media_stream_infobar.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_MEDIA_STREAM_INFOBAR_H_ #define CHROME_BROWSER_UI_VIEWS_INFOBARS_MEDIA_STREAM_INFOBAR_H_ -#include "chrome/browser/infobars/infobar_delegate.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/media/media_stream_devices_menu_model.h" #include "chrome/browser/ui/views/infobars/infobar_background.h" #include "chrome/browser/ui/views/infobars/infobar_view.h" diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc index 1a7486b..4d24a45 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -22,9 +22,9 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" +#include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h" #include "chrome/browser/ui/website_settings/website_settings_ui.h" diff --git a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h index 51bd4a7..88def0e 100644 --- a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h +++ b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_INFOBAR_DELEGATE_H_ -#include "chrome/browser/tab_contents/confirm_infobar_delegate.h" +#include "chrome/browser/api/infobars/confirm_infobar_delegate.h" // This class configures an infobar that is shown when the website settings UI // is closed and the settings for one or more site permissions have been diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc index 02f0724..d8cedc0 100644 --- a/chrome/browser/ui/website_settings/website_settings_unittest.cc +++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc @@ -8,9 +8,9 @@ #include "base/message_loop.h" #include "base/string16.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/infobars/infobar_delegate.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" -#include "chrome/browser/infobars/infobar_delegate.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/ui/website_settings/website_settings_ui.h" #include "chrome/common/content_settings.h" |