Index: components/password_manager/content/browser/content_password_manager_driver_factory.cc |
diff --git a/components/password_manager/content/browser/content_password_manager_driver_factory.cc b/components/password_manager/content/browser/content_password_manager_driver_factory.cc |
index 8a07ab9d1c4579f54bbff53771203ca8b3e73cb5..26e508d8f0b9b0235ef549cf679eb4243f46e0b0 100644 |
--- a/components/password_manager/content/browser/content_password_manager_driver_factory.cc |
+++ b/components/password_manager/content/browser/content_password_manager_driver_factory.cc |
@@ -77,8 +77,11 @@ ContentPasswordManagerDriverFactory::GetDriverForFrame( |
void ContentPasswordManagerDriverFactory::RenderFrameCreated( |
content::RenderFrameHost* render_frame_host) { |
// This is called twice for the main frame. |
- if (!ContainsKey(frame_driver_map_, render_frame_host)) |
- CreateDriverForFrame(render_frame_host); |
+ if (!ContainsKey(frame_driver_map_, render_frame_host)) { |
+ ContentPasswordManagerDriver* new_driver = |
+ CreateDriverForFrame(render_frame_host); |
+ new_driver->NotifyAboutLoggingAvailability(logging_available_); |
+ } |
} |
void ContentPasswordManagerDriverFactory::RenderFrameDeleted( |
@@ -108,13 +111,16 @@ void ContentPasswordManagerDriverFactory::DidNavigateAnyFrame( |
->second->DidNavigateFrame(details, params); |
} |
-void ContentPasswordManagerDriverFactory::CreateDriverForFrame( |
+ContentPasswordManagerDriver* |
+ContentPasswordManagerDriverFactory::CreateDriverForFrame( |
content::RenderFrameHost* render_frame_host) { |
DCHECK(!ContainsKey(frame_driver_map_, render_frame_host)); |
- frame_driver_map_.set( |
- render_frame_host, |
- make_scoped_ptr(new ContentPasswordManagerDriver( |
- render_frame_host, password_client_, autofill_client_))); |
+ scoped_ptr<ContentPasswordManagerDriver> driver( |
+ new ContentPasswordManagerDriver(render_frame_host, password_client_, |
+ autofill_client_)); |
+ ContentPasswordManagerDriver* weak_return_pointer = driver.get(); |
+ frame_driver_map_.set(render_frame_host, driver.Pass()); |
+ return weak_return_pointer; |
} |
void ContentPasswordManagerDriverFactory::TestingSetDriverForFrame( |
@@ -123,4 +129,14 @@ void ContentPasswordManagerDriverFactory::TestingSetDriverForFrame( |
frame_driver_map_.set(render_frame_host, driver.Pass()); |
} |
+void ContentPasswordManagerDriverFactory::NotifyDriversAboutLoggingAvailability( |
+ bool is_available) { |
+ if (is_available == logging_available_) |
+ return; |
+ logging_available_ = is_available; |
+ for (auto key_val_iterator : frame_driver_map_) { |
+ key_val_iterator.second->NotifyAboutLoggingAvailability(logging_available_); |
+ } |
+} |
+ |
} // namespace password_manager |