summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autofill
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-13 16:19:34 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-13 16:19:34 +0000
commit77a91c7f104222394a9b942cb1623b8a7dc07163 (patch)
tree5789fc71dab20cf0710bc34b0c2aca6f08f1581b /chrome/browser/autofill
parent01b3b9d5148f9b2934d33e5069ae916589179059 (diff)
downloadchromium_src-77a91c7f104222394a9b942cb1623b8a7dc07163.zip
chromium_src-77a91c7f104222394a9b942cb1623b8a7dc07163.tar.gz
chromium_src-77a91c7f104222394a9b942cb1623b8a7dc07163.tar.bz2
Create chrome/browser/api directory. Move infobar delegates used by Autofill to the directory.
Also, consolidate infobar delegate interfaces under infobars/ rather than some under infobars/ and some under tab_contents/, as the ones under tab_contents/ were not coupled with tab_contents/ in any way. Remove feedback/proto/extension.pb.h from Autofill's DEPS file simply by dropping the include, it was not being used. BUG=140037,138280 Review URL: https://chromiumcodereview.appspot.com/10843071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autofill')
-rw-r--r--chrome/browser/autofill/DEPS3
-rw-r--r--chrome/browser/autofill/autofill_cc_infobar_delegate.h2
-rw-r--r--chrome/browser/autofill/autofill_country.cc4
-rw-r--r--chrome/browser/autofill/autofill_feedback_infobar_delegate.cc1
-rw-r--r--chrome/browser/autofill/autofill_feedback_infobar_delegate.h2
5 files changed, 4 insertions, 8 deletions
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