Move one_click_signin_infobar_delegate.* from chrome/browser/api/infobars/ to...

Move one_click_signin_infobar_delegate.* from chrome/browser/api/infobars/ to chrome/browser/ui/sync/ (alongside the rest of the one_click_signin_xxx files).

BUG=none
TEST=none
TBR=sky
Review URL: https://codereview.chromium.org/11744015

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

chrome/browser/ui/sync/one_click_signin_helper.cc

@@ -14,7 +14,6 @@
 #include "base/supports_user_data.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
-#include "chrome/browser/api/infobars/one_click_signin_infobar_delegate.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/google/google_util.h"
@@ -33,6 +32,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/sync/one_click_signin_histogram.h"
+#include "chrome/browser/ui/sync/one_click_signin_infobar_delegate.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"

chrome/browser/api/infobars/one_click_signin_infobar_delegate.cc → chrome/browser/ui/sync/one_click_signin_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/api/infobars/one_click_signin_infobar_delegate.h"
+#include "chrome/browser/ui/sync/one_click_signin_infobar_delegate.h"
 
 OneClickSigninInfoBarDelegate::OneClickSigninInfoBarDelegate(
     InfoBarService* infobar_service)

chrome/browser/api/infobars/one_click_signin_infobar_delegate.h → chrome/browser/ui/sync/one_click_signin_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_API_INFOBARS_ONE_CLICK_SIGNIN_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_API_INFOBARS_ONE_CLICK_SIGNIN_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_INFOBAR_DELEGATE_H_
+#define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_INFOBAR_DELEGATE_H_
 
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -43,4 +43,4 @@ class OneClickSigninInfoBarDelegate : public ConfirmInfoBarDelegate {
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninInfoBarDelegate);
 };
 
-#endif  // CHROME_BROWSER_API_INFOBARS_ONE_CLICK_SIGNIN_INFOBAR_DELEGATE_H_
+#endif  // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_INFOBAR_DELEGATE_H_

chrome/browser/ui/views/infobars/one_click_signin_infobar.cc

@@ -4,8 +4,8 @@
 
 #include "chrome/browser/ui/views/infobars/one_click_signin_infobar.h"
 
-#include "chrome/browser/api/infobars/one_click_signin_infobar_delegate.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/browser/ui/sync/one_click_signin_infobar_delegate.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"

chrome/browser/ui/views/infobars/one_click_signin_infobar.h

@@ -5,9 +5,10 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_INFOBARS_ONE_CLICK_SIGNIN_INFOBAR_H_
 #define CHROME_BROWSER_UI_VIEWS_INFOBARS_ONE_CLICK_SIGNIN_INFOBAR_H_
 
-#include "chrome/browser/api/infobars/one_click_signin_infobar_delegate.h"
 #include "chrome/browser/ui/views/infobars/confirm_infobar.h"
 
+class OneClickSigninInfoBarDelegate;
+
 // A speialization of ConfirmInfoBar that allows changing the background
 // colour of the infobar as well as the colour of the OK button.  The behaviour
 // remains the same.

chrome/chrome_browser.gypi

@@ -110,8 +110,6 @@
         'browser/api/infobars/infobar_delegate.cc',
         'browser/api/infobars/infobar_delegate.h',
         'browser/api/infobars/infobar_service.h',
-        'browser/api/infobars/one_click_signin_infobar_delegate.cc',
-        'browser/api/infobars/one_click_signin_infobar_delegate.h',
         'browser/api/infobars/simple_alert_infobar_delegate.cc',
         'browser/api/infobars/simple_alert_infobar_delegate.h',
         'browser/api/sync/profile_sync_service_base.h',
@@ -2303,12 +2301,6 @@
             'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']},
           },
         }],
-        ['enable_one_click_signin==0', {
-          'sources!': [
-            'browser/api/infobars/one_click_signin_infobar_delegate.cc',
-            'browser/api/infobars/one_click_signin_infobar_delegate.h',
-          ],
-        }],
         ['enable_extensions==1', {
           'sources': [
             # Only extension API implementations should go here.

chrome/chrome_browser_ui.gypi

@@ -1260,6 +1260,8 @@
         'browser/ui/sync/one_click_signin_helper.cc',
         'browser/ui/sync/one_click_signin_helper.h',
         'browser/ui/sync/one_click_signin_histogram.h',
+        'browser/ui/sync/one_click_signin_infobar_delegate.cc',
+        'browser/ui/sync/one_click_signin_infobar_delegate.h',
         'browser/ui/sync/one_click_signin_sync_starter.cc',
         'browser/ui/sync/one_click_signin_sync_starter.h',
         'browser/ui/sync/tab_contents_synced_tab_delegate.cc',
@@ -2196,6 +2198,8 @@
             'browser/ui/sync/one_click_signin_helper.cc',
             'browser/ui/sync/one_click_signin_helper.h',
             'browser/ui/sync/one_click_signin_histogram.h',
+            'browser/ui/sync/one_click_signin_infobar_delegate.cc',
+            'browser/ui/sync/one_click_signin_infobar_delegate.h',
             'browser/ui/sync/one_click_signin_sync_starter.cc',
             'browser/ui/sync/one_click_signin_sync_starter.h',
             'browser/ui/views/infobars/one_click_signin_infobar.cc',