Merge to branch 2214 [Password Generation] Hide popup if view can not be created.

chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc

 // Copyright 2014 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/autofill/password_generation_popup_controller_impl.h"
 
 #include <math.h>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_split.h"
@@ skipping 164 matching lines @@
                                                     bounds.height());
 }
 
 void PasswordGenerationPopupControllerImpl::Show(bool display_password) {
   display_password_ = display_password;
   if (display_password_ && current_password_.empty())
     current_password_ = base::ASCIIToUTF16(generator_->Generate());
 
   if (!view_) {
     view_ = PasswordGenerationPopupView::Create(this);
+
+    // Treat popup as being hidden if creation fails.
+    if (!view_) {
+      Hide();
+      return;
+    }
+
     CalculateBounds();
     view_->Show();
   } else {
     CalculateBounds();
     view_->UpdateBoundsAndRedrawPopup();
   }
 
   controller_common_.RegisterKeyPressCallback();
 
   if (observer_)
@@ skipping 84 matching lines @@
 
 const base::string16& PasswordGenerationPopupControllerImpl::HelpText() {
   return help_text_;
 }
 
 const gfx::Range& PasswordGenerationPopupControllerImpl::HelpTextLinkRange() {
   return link_range_;
 }
 
 }  // namespace autofill