Add flags for new Autofill work.

chrome/browser/ui/tab_contents/tab_contents.cc

 // Copyright (c) 2012 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/ui/tab_contents/tab_contents.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
@@ skipping 99 matching lines @@
 
   // SessionTabHelper comes first because it sets up the tab ID, and other
   // helpers may rely on that.
   SessionTabHelper::CreateForWebContents(contents);
 
   AlternateErrorPageTabObserver::CreateForWebContents(contents);
   AutocompleteHistoryManager::CreateForWebContents(contents);
   TabAutofillManagerDelegate::CreateForWebContents(contents);
   AutofillManager::CreateForWebContentsAndDelegate(
       contents, TabAutofillManagerDelegate::FromWebContents(contents));
+#if !defined(OS_ANDROID)

[Albert Bodenhamer, 2012/10/19 16:46:52]

Wrapping an if() in a conditional compile like this is a bit hard to read. 
Consider:
#if defined(OS_ANDROID)
  bool enable_new_autofill_ui = true;
#else
  bool enable_new_autofill_ui = CommandLine::ForCurrentProcess()->HasSwitch(   
switches::kEnableNewAutofillUi))
#endif

if(enable_new_autofill_ui) {

[joth, 2012/10/19 22:04:06]

Android is just about to stop using tab_contents.cc altogether, so you could
TODO(nileshagrawal) to remove this ifdef  real soon now.

[Ilya Sherman, 2012/10/19 22:16:26]

Given joth's comment, I've left the code in android/chrome_startup_flags.cc and
added a TODO for Nilesh to remove the code once the dependency on
tab_contents.cc is gone.

   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kExternalAutofillPopup)) {
+          switches::kEnableNewAutofillUi)) {
+#else
+  // Always enable the external popup on Android.
+  if (true) {
+#endif
     AutofillExternalDelegate::CreateForWebContentsAndManager(
         contents, AutofillManager::FromWebContents(contents));
     AutofillManager::FromWebContents(contents)->SetExternalDelegate(
         AutofillExternalDelegate::FromWebContents(contents));
     AutocompleteHistoryManager::FromWebContents(contents)->SetExternalDelegate(
         AutofillExternalDelegate::FromWebContents(contents));
   }
   BlockedContentTabHelper::CreateForWebContents(contents);
   BookmarkTabHelper::CreateForWebContents(contents);
   chrome_browser_net::LoadTimeStatsTabHelper::CreateForWebContents(contents);
@@ skipping 94 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsObserver overrides
 
 void TabContents::WebContentsDestroyed(WebContents* tab) {
   // Destruction of the WebContents should only be done by us from our
   // destructor. Otherwise it's very likely we (or one of the helpers we own)
   // will attempt to access the WebContents and we'll crash.
   DCHECK(in_destructor_);
 }