Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

Issue 861103002: Credentials chooser UI for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased on top of master Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h" 5 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/browsing_data/browsing_data_helper.h" 8 #include "chrome/browser/browsing_data/browsing_data_helper.h"
9 #include "chrome/browser/password_manager/chrome_password_manager_client.h" 9 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
10 #include "chrome/browser/password_manager/password_store_factory.h" 10 #include "chrome/browser/password_manager/password_store_factory.h"
11 #include "chrome/browser/ui/browser_command_controller.h" 11 #include "chrome/browser/ui/browser_command_controller.h"
12 #include "chrome/browser/ui/browser_finder.h" 12 #include "chrome/browser/ui/browser_finder.h"
13 #include "chrome/browser/ui/browser_window.h" 13 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/chrome_pages.h" 14 #include "chrome/browser/ui/chrome_pages.h"
15 #include "chrome/browser/ui/location_bar/location_bar.h" 15 #include "chrome/browser/ui/location_bar/location_bar.h"
16 #include "chrome/browser/ui/passwords/manage_passwords_icon.h" 16 #include "chrome/browser/ui/passwords/manage_passwords_icon.h"
17 #include "chrome/browser/ui/passwords/password_bubble_experiment.h" 17 #include "chrome/browser/ui/passwords/password_bubble_experiment.h"
18 #include "chrome/browser/ui/tab_dialogs.h" 18 #include "chrome/browser/ui/tab_dialogs.h"
19 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
20 #include "components/password_manager/content/common/credential_manager_types.h" 20 #include "components/password_manager/content/common/credential_manager_types.h"
21 #include "components/password_manager/core/browser/browser_save_password_progres s_logger.h" 21 #include "components/password_manager/core/browser/browser_save_password_progres s_logger.h"
22 #include "components/password_manager/core/browser/password_form_manager.h" 22 #include "components/password_manager/core/browser/password_form_manager.h"
23 #include "content/public/browser/navigation_details.h" 23 #include "content/public/browser/navigation_details.h"
24 24
25 #if defined(OS_ANDROID) 25 #if defined(OS_ANDROID)
26 #include "chrome/browser/android/chromium_application.h" 26 #include "chrome/browser/android/chromium_application.h"
27 #include "chrome/browser/password_manager/account_chooser_infobar_delegate_andro id.h"
27 #endif 28 #endif
28 29
29 using autofill::PasswordFormMap; 30 using autofill::PasswordFormMap;
30 using password_manager::PasswordFormManager; 31 using password_manager::PasswordFormManager;
31 32
32 namespace { 33 namespace {
33 34
34 password_manager::PasswordStore* GetPasswordStore( 35 password_manager::PasswordStore* GetPasswordStore(
35 content::WebContents* web_contents) { 36 content::WebContents* web_contents) {
36 return PasswordStoreFactory::GetForProfile( 37 return PasswordStoreFactory::GetForProfile(
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // By providing origin explicitly. 126 // By providing origin explicitly.
126 if (!local_credentials.empty()) 127 if (!local_credentials.empty())
127 origin_ = local_credentials[0]->origin; 128 origin_ = local_credentials[0]->origin;
128 else 129 else
129 origin_ = GURL(); 130 origin_ = GURL();
130 local_credentials_forms_.swap(local_credentials); 131 local_credentials_forms_.swap(local_credentials);
131 federated_credentials_forms_.swap(federated_credentials); 132 federated_credentials_forms_.swap(federated_credentials);
132 // The map is useless because usernames may overlap. 133 // The map is useless because usernames may overlap.
133 password_form_map_.clear(); 134 password_form_map_.clear();
134 SetState(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE); 135 SetState(password_manager::ui::CREDENTIAL_REQUEST_AND_BUBBLE_STATE);
136 #if defined(OS_ANDROID)
137 AccountChooserInfoBarDelegateAndroid::Create(web_contents(), this);
138 credentials_callback_ = callback;
139 return true;
140 #else
135 UpdateBubbleAndIconVisibility(); 141 UpdateBubbleAndIconVisibility();
142 #endif
136 if (bubble_shown_) 143 if (bubble_shown_)
137 credentials_callback_ = callback; 144 credentials_callback_ = callback;
138 return bubble_shown_; 145 return bubble_shown_;
139 } 146 }
140 147
141 void ManagePasswordsUIController::OnAutomaticPasswordSave( 148 void ManagePasswordsUIController::OnAutomaticPasswordSave(
142 scoped_ptr<PasswordFormManager> form_manager) { 149 scoped_ptr<PasswordFormManager> form_manager) {
143 form_manager_ = form_manager.Pass(); 150 form_manager_ = form_manager.Pass();
144 password_form_map_ = ConstifyMap(form_manager_->best_matches()); 151 password_form_map_ = ConstifyMap(form_manager_->best_matches());
145 password_form_map_[form_manager_->associated_username()] = 152 password_form_map_[form_manager_->associated_username()] =
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 bool ManagePasswordsUIController::PasswordPendingUserDecision() const { 363 bool ManagePasswordsUIController::PasswordPendingUserDecision() const {
357 return password_manager::ui::IsPendingState(state_); 364 return password_manager::ui::IsPendingState(state_);
358 } 365 }
359 366
360 void ManagePasswordsUIController::WebContentsDestroyed() { 367 void ManagePasswordsUIController::WebContentsDestroyed() {
361 password_manager::PasswordStore* password_store = 368 password_manager::PasswordStore* password_store =
362 GetPasswordStore(web_contents()); 369 GetPasswordStore(web_contents());
363 if (password_store) 370 if (password_store)
364 password_store->RemoveObserver(this); 371 password_store->RemoveObserver(this);
365 } 372 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698