Fix autofill popup controller key press callback registration

chrome/browser/ui/autofill/password_generation_popup_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PASSWORD_GENERATION_POPUP_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PASSWORD_GENERATION_POPUP_CONTROLLER_IMPL_H_
 
 #include <stddef.h>
 #include <string>
 
@@ skipping 53 matching lines @@
 
   // Create a PasswordGenerationPopupView if one doesn't already exist.
   // If |display_password| is true, a generated password is shown that can be
   // selected by the user. Otherwise just the text explaining generated
   // passwords is shown. Idempotent.
   void Show(bool display_password);
 
   // Hides the popup and destroys |this|.
   void HideAndDestroy();
 
-  // Accessors.
-  content::WebContents* web_contents() {
-    return controller_common_.web_contents();
-  }
-
  protected:
   PasswordGenerationPopupControllerImpl(
       const gfx::RectF& bounds,
       const PasswordForm& form,
       int max_length,
       password_manager::PasswordManager* password_manager,
       password_manager::PasswordManagerDriver* driver,
       PasswordGenerationPopupObserver* observer,
       content::WebContents* web_contents,
       gfx::NativeView container_view);
@@ skipping 45 matching lines @@
   PasswordForm form_;
   password_manager::PasswordManager* password_manager_;
   password_manager::PasswordManagerDriver* driver_;
 
   // May be NULL.
   PasswordGenerationPopupObserver* observer_;
 
   // Controls how passwords are generated.
   std::unique_ptr<PasswordGenerator> generator_;
 
-  // Contains common popup functionality.
-  PopupControllerCommon controller_common_;
+  // Contains common popup data.
+  const PopupControllerCommon controller_common_;
 
   // Help text and the range in the text that corresponds to the saved passwords
   // link.
   base::string16 help_text_;
   gfx::Range link_range_;
 
   base::string16 current_password_;
   bool password_selected_;
 
   // If a password will be shown in this popup.
   bool display_password_;
 
   // Bounds for all the elements of the popup.
   gfx::Rect popup_bounds_;
 
   PopupViewCommon view_common_;
 
+  content::WebContents* const web_contents_;
+
   base::WeakPtrFactory<PasswordGenerationPopupControllerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordGenerationPopupControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_PASSWORD_GENERATION_POPUP_CONTROLLER_IMPL_H_