summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/chrome_content_renderer_client.cc
diff options
context:
space:
mode:
authorgcasto@chromium.org <gcasto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-31 23:12:23 +0000
committergcasto@chromium.org <gcasto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-31 23:12:23 +0000
commit3cbdf9363d3c014d5ff484a30ab36c6bc9972bc9 (patch)
tree4a8d97ff50b587f5e95ea3826cec76f9b79474b9 /chrome/renderer/chrome_content_renderer_client.cc
parent598ed4879c529168b8ca5186eed85ec691ee09ea (diff)
downloadchromium_src-3cbdf9363d3c014d5ff484a30ab36c6bc9972bc9.zip
chromium_src-3cbdf9363d3c014d5ff484a30ab36c6bc9972bc9.tar.gz
chromium_src-3cbdf9363d3c014d5ff484a30ab36c6bc9972bc9.tar.bz2
Re-land r248110 "[Password Generation] Enable new UI"
Replaces key icon and associated bubble with autofill style dropdown. Changes include - Update PasswordGenerationAgentTest - Add interactive_uitest for new UI. - Sync edits to confirmation password field(s). - Update UMA stats to more accurately reflect user choices. Updating the generation popup to match the latest mocks and implement the editing popup will come in a later CL. This reverts r248119 and fixes a use-after-free in PasswordGenerationPopupControllerImpl::PossiblyAcceptPassword() R=asvitkine@chromium.org, estade@chromium.org TBR=kenrb@chromium.org, sky@chromium.org, torne@chromium.org BUG=318977 Review URL: https://codereview.chromium.org/151503006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_content_renderer_client.cc')
-rw-r--r--chrome/renderer/chrome_content_renderer_client.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 9ea0b8f..870b7a3 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -68,7 +68,6 @@
#include "components/autofill/content/renderer/autofill_agent.h"
#include "components/autofill/content/renderer/password_autofill_agent.h"
#include "components/autofill/content/renderer/password_generation_agent.h"
-#include "components/autofill/core/common/password_generation_util.h"
#include "components/nacl/renderer/ppb_nacl_private_impl.h"
#include "components/plugins/renderer/mobile_youtube_plugin.h"
#include "components/visitedlink/renderer/visitedlink_slave.h"
@@ -406,13 +405,15 @@ void ChromeContentRendererClient::RenderViewCreated(
safe_browsing::MalwareDOMDetails::Create(render_view);
#endif
+ PasswordGenerationAgent* password_generation_agent =
+ new PasswordGenerationAgent(render_view);
PasswordAutofillAgent* password_autofill_agent =
new PasswordAutofillAgent(render_view);
- new AutofillAgent(render_view, password_autofill_agent);
+ new AutofillAgent(render_view,
+ password_autofill_agent,
+ password_generation_agent);
CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (autofill::password_generation::IsPasswordGenerationEnabled())
- new PasswordGenerationAgent(render_view);
if (command_line->HasSwitch(switches::kInstantProcess))
new SearchBox(render_view);