diff options
author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 23:38:50 +0000 |
---|---|---|
committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 23:38:50 +0000 |
commit | d60237b308273eb22b96b4247b1a9d12d7e99dfe (patch) | |
tree | 2e18fefbf5d29a36bae79a4f111f4e131deacd3b /chrome | |
parent | 9ed597ba1ed53df297d65c04d76f009bf98cb7f1 (diff) | |
download | chromium_src-d60237b308273eb22b96b4247b1a9d12d7e99dfe.zip chromium_src-d60237b308273eb22b96b4247b1a9d12d7e99dfe.tar.gz chromium_src-d60237b308273eb22b96b4247b1a9d12d7e99dfe.tar.bz2 |
Rename OnPasswordFormsFound -> OnPasswordFormsParsed and OnPasswordFormsVisible -> OnPasswordFormsRendered
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9796011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
7 files changed, 36 insertions, 36 deletions
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 9f37192..31bc7ef 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -163,16 +163,16 @@ void PasswordManager::DidNavigateAnyFrame( bool PasswordManager::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(PasswordManager, message) - IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordFormsFound, - OnPasswordFormsFound) - IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordFormsVisible, - OnPasswordFormsVisible) + IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordFormsParsed, + OnPasswordFormsParsed) + IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordFormsRendered, + OnPasswordFormsRendered) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } -void PasswordManager::OnPasswordFormsFound( +void PasswordManager::OnPasswordFormsParsed( const std::vector<PasswordForm>& forms) { if (!IsEnabled()) return; @@ -191,7 +191,7 @@ void PasswordManager::OnPasswordFormsFound( } } -void PasswordManager::OnPasswordFormsVisible( +void PasswordManager::OnPasswordFormsRendered( const std::vector<PasswordForm>& visible_forms) { if (!provisional_save_manager_.get()) return; diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h index fbd6ab6b..e07d234 100644 --- a/chrome/browser/password_manager/password_manager.h +++ b/chrome/browser/password_manager/password_manager.h @@ -63,9 +63,9 @@ class PasswordManager : public LoginModel, // TODO(isherman): This should not be public, but is currently being used by // the LoginPrompt code. - void OnPasswordFormsFound( + void OnPasswordFormsParsed( const std::vector<webkit::forms::PasswordForm>& forms); - void OnPasswordFormsVisible( + void OnPasswordFormsRendered( const std::vector<webkit::forms::PasswordForm>& visible_forms); private: diff --git a/chrome/browser/password_manager/password_manager_unittest.cc b/chrome/browser/password_manager/password_manager_unittest.cc index f3a0d30..72aa4fa2 100644 --- a/chrome/browser/password_manager/password_manager_unittest.cc +++ b/chrome/browser/password_manager/password_manager_unittest.cc @@ -115,8 +115,8 @@ TEST_F(PasswordManagerTest, FormSubmitEmptyStore) { std::vector<PasswordForm> observed; PasswordForm form(MakeSimpleForm()); observed.push_back(form); - manager()->OnPasswordFormsFound(observed); // The initial load. - manager()->OnPasswordFormsVisible(observed); // The initial layout. + manager()->OnPasswordFormsParsed(observed); // The initial load. + manager()->OnPasswordFormsRendered(observed); // The initial layout. // And the form submit contract is to call ProvisionallySavePassword. manager()->ProvisionallySavePassword(form); @@ -150,8 +150,8 @@ TEST_F(PasswordManagerTest, FormSubmitNoGoodMatch) { std::vector<PasswordForm> observed; PasswordForm form(MakeSimpleForm()); observed.push_back(form); - manager()->OnPasswordFormsFound(observed); // The initial load. - manager()->OnPasswordFormsVisible(observed); // The initial layout. + manager()->OnPasswordFormsParsed(observed); // The initial load. + manager()->OnPasswordFormsRendered(observed); // The initial layout. manager()->ProvisionallySavePassword(form); // We still expect an add, since we didn't have a good match. @@ -174,8 +174,8 @@ TEST_F(PasswordManagerTest, FormSeenThenLeftPage) { std::vector<PasswordForm> observed; PasswordForm form(MakeSimpleForm()); observed.push_back(form); - manager()->OnPasswordFormsFound(observed); // The initial load. - manager()->OnPasswordFormsVisible(observed); // The initial layout. + manager()->OnPasswordFormsParsed(observed); // The initial load. + manager()->OnPasswordFormsRendered(observed); // The initial layout. PasswordForm empty_form(form); empty_form.username_value = string16(); @@ -200,8 +200,8 @@ TEST_F(PasswordManagerTest, FormSubmitAfterNavigateSubframe) { std::vector<PasswordForm> observed; PasswordForm form(MakeSimpleForm()); observed.push_back(form); - manager()->OnPasswordFormsFound(observed); // The initial load. - manager()->OnPasswordFormsVisible(observed); // The initial layout. + manager()->OnPasswordFormsParsed(observed); // The initial load. + manager()->OnPasswordFormsRendered(observed); // The initial layout. scoped_ptr<PasswordFormManager> form_to_save; EXPECT_CALL(delegate_, AddSavePasswordInfoBarIfPermitted(_)) @@ -234,14 +234,14 @@ TEST_F(PasswordManagerTest, FormSubmitFailedLogin) { std::vector<PasswordForm> observed; PasswordForm form(MakeSimpleForm()); observed.push_back(form); - manager()->OnPasswordFormsFound(observed); // The initial load. - manager()->OnPasswordFormsVisible(observed); // The initial layout. + manager()->OnPasswordFormsParsed(observed); // The initial load. + manager()->OnPasswordFormsRendered(observed); // The initial layout. manager()->ProvisionallySavePassword(form); // The form reappears, and is visible in the layout: - manager()->OnPasswordFormsFound(observed); - manager()->OnPasswordFormsVisible(observed); + manager()->OnPasswordFormsParsed(observed); + manager()->OnPasswordFormsRendered(observed); // No expected calls to the PasswordStore... manager()->DidStopLoading(); @@ -257,14 +257,14 @@ TEST_F(PasswordManagerTest, FormSubmitInvisibleLogin) { std::vector<PasswordForm> observed; PasswordForm form(MakeSimpleForm()); observed.push_back(form); - manager()->OnPasswordFormsFound(observed); // The initial load. - manager()->OnPasswordFormsVisible(observed); // The initial layout. + manager()->OnPasswordFormsParsed(observed); // The initial load. + manager()->OnPasswordFormsRendered(observed); // The initial layout. manager()->ProvisionallySavePassword(form); // The form reappears, but is not visible in the layout: - manager()->OnPasswordFormsFound(observed); - // No call to PasswordFormsVisible. + manager()->OnPasswordFormsParsed(observed); + // No call to PasswordFormsRendered. // Expect info bar to appear: scoped_ptr<PasswordFormManager> form_to_save; @@ -290,8 +290,8 @@ TEST_F(PasswordManagerTest, InitiallyInvisibleForm) { std::vector<PasswordForm> observed; PasswordForm form(MakeSimpleForm()); observed.push_back(form); - manager()->OnPasswordFormsFound(observed); // The initial load. - // PasswordFormsVisible is not called. + manager()->OnPasswordFormsParsed(observed); // The initial load. + // PasswordFormsRendered is not called. manager()->DidStopLoading(); } diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index c39d25d..74400df 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -393,7 +393,7 @@ void LoginHandler::CloseContentsDeferred() { } // Helper to create a PasswordForm and stuff it into a vector as input -// for PasswordManager::PasswordFormsFound, the hook into PasswordManager. +// for PasswordManager::PasswordFormsParsed, the hook into PasswordManager. void MakeInputForPasswordManager( const GURL& request_url, net::AuthChallengeInfo* auth_info, @@ -454,7 +454,7 @@ void LoginDialogCallback(const GURL& request_url, PasswordManager* password_manager = wrapper->password_manager(); std::vector<PasswordForm> v; MakeInputForPasswordManager(request_url, auth_info, handler, &v); - password_manager->OnPasswordFormsFound(v); + password_manager->OnPasswordFormsParsed(v); handler->SetPasswordManager(password_manager); // The realm is controlled by the remote server, so there is no reason diff --git a/chrome/common/autofill_messages.h b/chrome/common/autofill_messages.h index 4542e49..b915ed2 100644 --- a/chrome/common/autofill_messages.h +++ b/chrome/common/autofill_messages.h @@ -126,12 +126,12 @@ IPC_MESSAGE_ROUTED2(AutofillHostMsg_FormsSeen, // Notification that password forms have been seen that are candidates for // filling/submitting by the password manager. -IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsFound, +IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsParsed, std::vector<webkit::forms::PasswordForm> /* forms */) // Notification that initial layout has occurred and the following password // forms are visible on the page (e.g. not set to display:none.) -IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsVisible, +IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsRendered, std::vector<webkit::forms::PasswordForm> /* forms */) // Notification that a form has been submitted. The user hit the button. diff --git a/chrome/renderer/autofill/password_autofill_manager.cc b/chrome/renderer/autofill/password_autofill_manager.cc index 65dba44..dee68f4 100644 --- a/chrome/renderer/autofill/password_autofill_manager.cc +++ b/chrome/renderer/autofill/password_autofill_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -361,10 +361,10 @@ void PasswordAutofillManager::SendPasswordForms(WebKit::WebFrame* frame, return; if (only_visible) { - Send(new AutofillHostMsg_PasswordFormsVisible( + Send(new AutofillHostMsg_PasswordFormsRendered( routing_id(), password_forms)); } else { - Send(new AutofillHostMsg_PasswordFormsFound(routing_id(), password_forms)); + Send(new AutofillHostMsg_PasswordFormsParsed(routing_id(), password_forms)); } } diff --git a/chrome/renderer/autofill/password_autofill_manager_browsertest.cc b/chrome/renderer/autofill/password_autofill_manager_browsertest.cc index b59bbda..7d1dea0 100644 --- a/chrome/renderer/autofill/password_autofill_manager_browsertest.cc +++ b/chrome/renderer/autofill/password_autofill_manager_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -183,11 +183,11 @@ TEST_F(PasswordAutofillManagerTest, InitialAutocomplete) { // The form has been loaded, we should have sent the browser a message about // the form. const IPC::Message* msg = render_thread_.sink().GetFirstMessageMatching( - AutofillHostMsg_PasswordFormsFound::ID); + AutofillHostMsg_PasswordFormsParsed::ID); ASSERT_TRUE(msg != NULL); Tuple1<std::vector<PasswordForm> > forms; - AutofillHostMsg_PasswordFormsFound::Read(msg, &forms); + AutofillHostMsg_PasswordFormsParsed::Read(msg, &forms); ASSERT_EQ(1U, forms.a.size()); PasswordForm password_form = forms.a[0]; EXPECT_EQ(PasswordForm::SCHEME_HTML, password_form.scheme); |