Start of New Autofill UI for Windows

chrome/browser/autofill/autofill_external_delegate.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 "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::RenderViewHost;
 using WebKit::WebAutofillClient;
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
+    ClearPreviewedForm();
 }
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     TabContents* tab_contents,
     AutofillManager* autofill_manager)
     : tab_contents_(tab_contents),
       autofill_manager_(autofill_manager),
       password_autofill_manager_(
           tab_contents ? tab_contents->web_contents() : NULL),
       autofill_query_id_(0),
@@ skipping 172 matching lines @@
   } else {
     FillAutofillFormData(unique_id, false);
   }
 
   HideAutofillPopup();
 
   return true;
 }
 
 void AutofillExternalDelegate::ClearPreviewedForm() {
-  RenderViewHost* host = tab_contents_->web_contents()->GetRenderViewHost();
-  host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
+  if (tab_contents_->web_contents()) {
+    RenderViewHost* host = tab_contents_->web_contents()->GetRenderViewHost();
+
+    if (host)
+      host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
+  }
 }
 
 void AutofillExternalDelegate::HideAutofillPopup() {
   popup_visible_ = false;
 
   HideAutofillPopupInternal();
 }
 
 void AutofillExternalDelegate::Reset() {
   HideAutofillPopup();
@@ skipping 110 matching lines @@
                           data_list_labels_.begin(),
                           data_list_labels_.end());
   autofill_icons->insert(autofill_icons->begin(),
                          data_list_icons_.begin(),
                          data_list_icons_.end());
   autofill_unique_ids->insert(autofill_unique_ids->begin(),
                               data_list_unique_ids_.begin(),
                               data_list_unique_ids_.end());
 }
 
-// Add a "!defined(OS_YOUROS) for each platform that implements this
-// in an autofill_external_delegate_YOUROS.cc.  Currently there are
-// none, so all platforms use the default.
 
-#if !defined(OS_ANDROID) && !defined(TOOLKIT_GTK)
+#if defined(OS_MACOSX)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContents*, AutofillManager*) {
   return NULL;
 }
 
 #endif