Move AutofillExternalDelegateGtk to chrome/browser/ui/gtk/autofill, where it belongs.

The class implementation is all to do with UI, and has dependencies on
GTK UI code, so this seems a more appropriate home for it.  Moving it
to its rightful home also removes a couple of unwanted includes from
chrome/browser/autofill/DEPS.

TBR=ben@chromium.org
BUG=140037

Review URL: https://chromiumcodereview.appspot.com/10828259

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151467 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 8 deletions

diff --git a/chrome/browser/autofill/DEPS b/chrome/browser/autofill/DEPS
index 7da3cb7..02881c6 100644
--- a/chrome/browser/autofill/DEPS
+++ b/chrome/browser/autofill/DEPS
@@ -30,8 +30,6 @@ include_rules = [
   "!chrome/browser/ui/browser_finder.h",
   "!chrome/browser/ui/browser_window.h",
   "!chrome/browser/ui/chrome_pages.h",
-  "!chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h",
-  "!chrome/browser/ui/gtk/gtk_theme_service.h",
   "!chrome/browser/ui/tab_contents/tab_contents.h",
   "!chrome/browser/webdata/autofill_entry.h",
   "!chrome/browser/webdata/web_data_service.h",
diff --git a/chrome/browser/autofill/autofill_external_delegate_gtk.cc b/chrome/browser/ui/gtk/autofill/autofill_external_delegate_gtk.cc
index 57df577..c73e10b 100644
--- a/chrome/browser/autofill/autofill_external_delegate_gtk.cc
+++ b/chrome/browser/ui/gtk/autofill/autofill_external_delegate_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/autofill/autofill_external_delegate_gtk.h"
+#include "chrome/browser/ui/gtk/autofill/autofill_external_delegate_gtk.h"
 
 #include "chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
diff --git a/chrome/browser/autofill/autofill_external_delegate_gtk.h b/chrome/browser/ui/gtk/autofill/autofill_external_delegate_gtk.h
index 3043f9dd..18624dd 100644
--- a/chrome/browser/autofill/autofill_external_delegate_gtk.h
+++ b/chrome/browser/ui/gtk/autofill/autofill_external_delegate_gtk.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_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_GTK_H_
-#define CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_GTK_H_
+#define CHROME_BROWSER_UI_GTK_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_GTK_H_
 
 #include <gtk/gtk.h>
 
@@ -60,4 +60,4 @@ class AutofillExternalDelegateGtk : public AutofillExternalDelegate {
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegateGtk);
 };
 
-#endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_GTK_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2936b55..239c0f6 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -193,8 +193,6 @@
         'browser/autofill/autofill_download.h',
         'browser/autofill/autofill_external_delegate.cc',
         'browser/autofill/autofill_external_delegate.h',
-        'browser/autofill/autofill_external_delegate_gtk.cc',
-        'browser/autofill/autofill_external_delegate_gtk.h',
         'browser/autofill/autofill_feedback_infobar_delegate.cc',
         'browser/autofill/autofill_feedback_infobar_delegate.h',
         'browser/autofill/autofill_field.cc',
@@ -3075,6 +3073,8 @@
         'browser/ui/gtk/accelerators_gtk.h',
         'browser/ui/gtk/action_box_button_gtk.cc',
         'browser/ui/gtk/action_box_button_gtk.h',
+        'browser/ui/gtk/autofill/autofill_external_delegate_gtk.cc',
+        'browser/ui/gtk/autofill/autofill_external_delegate_gtk.h',
         'browser/ui/gtk/autofill/autofill_popup_view_gtk.cc',
         'browser/ui/gtk/autofill/autofill_popup_view_gtk.h',
         'browser/ui/gtk/avatar_menu_bubble_gtk.cc',