OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/data_use_measurement/chrome_data_use_ascriber.h" | 5 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "chrome/browser/data_use_measurement/chrome_data_use_recorder.h" | 10 #include "chrome/browser/data_use_measurement/chrome_data_use_recorder.h" |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
365 } | 365 } |
366 return; | 366 return; |
367 } | 367 } |
368 DataUseRecorderEntry old_frame_entry = frame_it->second; | 368 DataUseRecorderEntry old_frame_entry = frame_it->second; |
369 old_frame_entry->set_page_transition(page_transition); | 369 old_frame_entry->set_page_transition(page_transition); |
370 NotifyPageLoadCommit(old_frame_entry); | 370 NotifyPageLoadCommit(old_frame_entry); |
371 | 371 |
372 if (is_same_page_navigation) { | 372 if (is_same_page_navigation) { |
373 old_frame_entry->MergeFrom(&(*entry)); | 373 old_frame_entry->MergeFrom(&(*entry)); |
374 | 374 |
375 for (auto* request : entry->pending_url_requests()) | 375 for (auto& request : entry->pending_url_requests()) |
376 AscribeRecorderWithRequest(request, old_frame_entry); | 376 AscribeRecorderWithRequest(request.first, old_frame_entry); |
377 | 377 |
378 entry->RemoveAllPendingURLRequests(); | 378 entry->RemoveAllPendingURLRequests(); |
379 data_use_recorders_.erase(entry); | 379 data_use_recorders_.erase(entry); |
380 } else { | 380 } else { |
381 if (old_frame_entry->IsDataUseComplete()) { | 381 if (old_frame_entry->IsDataUseComplete()) { |
382 NotifyDataUseCompleted(old_frame_entry); | 382 NotifyDataUseCompleted(old_frame_entry); |
383 data_use_recorders_.erase(old_frame_entry); | 383 data_use_recorders_.erase(old_frame_entry); |
384 | 384 |
385 if (visible_main_render_frames_.find(mainframe) != | 385 if (visible_main_render_frames_.find(mainframe) != |
386 visible_main_render_frames_.end()) { | 386 visible_main_render_frames_.end()) { |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 DataUse::TrafficType traffic_type) { | 424 DataUse::TrafficType traffic_type) { |
425 DataUseRecorderEntry entry = | 425 DataUseRecorderEntry entry = |
426 data_use_recorders_.emplace(data_use_recorders_.end(), traffic_type); | 426 data_use_recorders_.emplace(data_use_recorders_.end(), traffic_type); |
427 if (request) | 427 if (request) |
428 AscribeRecorderWithRequest(request, entry); | 428 AscribeRecorderWithRequest(request, entry); |
429 return entry; | 429 return entry; |
430 } | 430 } |
431 | 431 |
432 void ChromeDataUseAscriber::AscribeRecorderWithRequest( | 432 void ChromeDataUseAscriber::AscribeRecorderWithRequest( |
433 net::URLRequest* request, | 433 net::URLRequest* request, |
434 DataUseRecorderEntry recorder) { | 434 DataUseRecorderEntry entry) { |
435 recorder->AddPendingURLRequest(request); | 435 entry->AddPendingURLRequest(request); |
436 request->SetUserData( | 436 request->SetUserData(DataUseRecorderEntryAsUserData::kUserDataKey, |
437 DataUseRecorderEntryAsUserData::kUserDataKey, | 437 base::MakeUnique<DataUseRecorderEntryAsUserData>(entry)); |
438 base::MakeUnique<DataUseRecorderEntryAsUserData>(recorder)); | |
439 } | 438 } |
440 | 439 |
441 void ChromeDataUseAscriber::WasShownOrHidden(int main_render_process_id, | 440 void ChromeDataUseAscriber::WasShownOrHidden(int main_render_process_id, |
442 int main_render_frame_id, | 441 int main_render_frame_id, |
443 bool visible) { | 442 bool visible) { |
444 RenderFrameHostID main_render_frame_host_id(main_render_process_id, | 443 RenderFrameHostID main_render_frame_host_id(main_render_process_id, |
445 main_render_frame_id); | 444 main_render_frame_id); |
446 | 445 |
447 auto frame_iter = | 446 auto frame_iter = |
448 main_render_frame_data_use_map_.find(main_render_frame_host_id); | 447 main_render_frame_data_use_map_.find(main_render_frame_host_id); |
(...skipping 20 matching lines...) Expand all Loading... |
469 pending_navigation_global_request_id_.find(old_frame); | 468 pending_navigation_global_request_id_.find(old_frame); |
470 if (pending_navigation_iter != pending_navigation_global_request_id_.end()) { | 469 if (pending_navigation_iter != pending_navigation_global_request_id_.end()) { |
471 pending_navigation_global_request_id_.insert(std::make_pair( | 470 pending_navigation_global_request_id_.insert(std::make_pair( |
472 RenderFrameHostID(new_render_process_id, new_render_frame_id), | 471 RenderFrameHostID(new_render_process_id, new_render_frame_id), |
473 pending_navigation_iter->second)); | 472 pending_navigation_iter->second)); |
474 pending_navigation_global_request_id_.erase(pending_navigation_iter); | 473 pending_navigation_global_request_id_.erase(pending_navigation_iter); |
475 } | 474 } |
476 } | 475 } |
477 | 476 |
478 } // namespace data_use_measurement | 477 } // namespace data_use_measurement |
OLD | NEW |