Moved Autofill view to appropriate browser/views folder.

BUG=33026
TEST=none
Review URL: http://codereview.chromium.org/558051

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

4 files changed, 15 insertions, 20 deletions

diff --git a/chrome/browser/autofill/autofill_dialog_win.cc b/chrome/browser/autofill/autofill_dialog_win.cc
deleted file mode 100644
index 4ea73abd3..0000000
--- a/chrome/browser/autofill/autofill_dialog_win.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/autofill/autofill_dialog.h"
-#include "chrome/browser/autofill/autofill_profiles_view_win.h"
-
-void ShowAutoFillDialog(AutoFillDialogObserver* observer,
-                        const std::vector<AutoFillProfile*>& profiles,
-                        const std::vector<CreditCard*>& credit_cards) {
-  AutoFillProfilesView::Show(observer, profiles, credit_cards);
-}
-
diff --git a/chrome/browser/autofill/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index 130e8b2..375ee39 100644
--- a/chrome/browser/autofill/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -1,7 +1,7 @@
 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#include "chrome/browser/autofill/autofill_profiles_view_win.h"
+#include "chrome/browser/views/autofill_profiles_view_win.h"
 
 #include <vsstyle.h>
 #include <vssym32.h>
@@ -1075,3 +1075,10 @@ void AutoFillProfilesView::AutoFillScrollView::Layout() {
   scroll_view_->Layout();
 }
 
+// Declared in "chrome/browser/autofill/autofill_dialog.h"
+void ShowAutoFillDialog(AutoFillDialogObserver* observer,
+                        const std::vector<AutoFillProfile*>& profiles,
+                        const std::vector<CreditCard*>& credit_cards) {
+  AutoFillProfilesView::Show(observer, profiles, credit_cards);
+}
+
diff --git a/chrome/browser/autofill/autofill_profiles_view_win.h b/chrome/browser/views/autofill_profiles_view_win.h
index 409b7cb..3eac54e 100644
--- a/chrome/browser/autofill/autofill_profiles_view_win.h
+++ b/chrome/browser/views/autofill_profiles_view_win.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_PROFILES_VIEW_WIN_H_
-#define CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILES_VIEW_WIN_H_
+#ifndef CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
+#define CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
 
 #include <vector>
 #include <list>
@@ -360,5 +360,5 @@ class AutoFillProfilesView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(AutoFillProfilesView);
 };
 
-#endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_PROFILES_VIEW_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a6187ce..17de9ec 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -87,7 +87,8 @@
         'browser/autofill/address.h',
         'browser/autofill/autofill_dialog_gtk.cc',
         'browser/autofill/autofill_dialog.cc',
-        'browser/autofill/autofill_dialog_win.cc',
+        # Windows version of autofill dialog is defined in
+        # 'browser/views/autofill_profiles_view_win.cc'
         'browser/autofill/autofill_dialog.h',
         'browser/autofill/autofill_field.cc',
         'browser/autofill/autofill_field.h',
@@ -97,8 +98,6 @@
         'browser/autofill/autofill_manager.h',
         'browser/autofill/autofill_profile.cc',
         'browser/autofill/autofill_profile.h',
-        'browser/autofill/autofill_profiles_view_win.cc',
-        'browser/autofill/autofill_profiles_view_win.h',
         'browser/autofill/autofill_type.cc',
         'browser/autofill/autofill_type.h',
         'browser/autofill/billing_address.h',
@@ -1706,6 +1705,8 @@
         'browser/views/autocomplete/autocomplete_popup_win.h',
         'browser/views/autocomplete/autocomplete_popup_gtk.cc',
         'browser/views/autocomplete/autocomplete_popup_gtk.h',
+        'browser/views/autofill_profiles_view_win.cc',
+        'browser/views/autofill_profiles_view_win.h',
         'browser/views/blocked_popup_container_view_views.cc',
         'browser/views/blocked_popup_container_view_views.h',
         'browser/views/bookmark_bar_instructions_view.cc',