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

Side by Side Diff: chrome/browser/data_use_measurement/chrome_data_use_ascriber.cc

Issue 2583703002: Record the tab state during data use (Closed)
Patch Set: Created 4 years 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 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 DCHECK(data_use_recorders_.empty()); 44 DCHECK(data_use_recorders_.empty());
45 } 45 }
46 46
47 ChromeDataUseRecorder* ChromeDataUseAscriber::GetDataUseRecorder( 47 ChromeDataUseRecorder* ChromeDataUseAscriber::GetDataUseRecorder(
48 net::URLRequest* request, 48 net::URLRequest* request,
49 bool can_create_new) { 49 bool can_create_new) {
50 DataUseRecorderEntry entry = GetDataUseRecorderEntry(request, can_create_new); 50 DataUseRecorderEntry entry = GetDataUseRecorderEntry(request, can_create_new);
51 return entry == data_use_recorders_.end() ? nullptr : &(*entry); 51 return entry == data_use_recorders_.end() ? nullptr : &(*entry);
52 } 52 }
53 53
54 const DataUseRecorder* ChromeDataUseAscriber::GetDataUseRecorderIfExists(
RyanSturm 2016/12/16 16:26:10 Since you are adding this for const-ness, can you
Raj 2016/12/16 19:59:10 Changed as you suggested. But I still think being
RyanSturm 2016/12/19 19:31:49 Sorry I was a little unclear. Const-method is good
55 const net::URLRequest* request) const {
56 // If a DataUseRecorder has already been set as user data, then return that.
57 auto user_data = static_cast<DataUseRecorderEntryAsUserData*>(
58 request->GetUserData(DataUseRecorderEntryAsUserData::kUserDataKey));
59 return (user_data && user_data->recorder_entry() != data_use_recorders_.end())
RyanSturm 2016/12/16 16:26:10 You shouldn't need to check user_data->recorder_en
Raj 2016/12/16 19:59:10 Done.
60 ? &(*user_data->recorder_entry())
61 : nullptr;
62 }
63
54 ChromeDataUseAscriber::DataUseRecorderEntry 64 ChromeDataUseAscriber::DataUseRecorderEntry
55 ChromeDataUseAscriber::GetDataUseRecorderEntry(net::URLRequest* request, 65 ChromeDataUseAscriber::GetDataUseRecorderEntry(net::URLRequest* request,
56 bool can_create_new) { 66 bool can_create_new) {
57 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 67 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
58 68
59 // TODO(ryansturm): Handle PlzNavigate (http://crbug/664233). 69 // TODO(ryansturm): Handle PlzNavigate (http://crbug/664233).
60 if (content::IsBrowserSideNavigationEnabled()) 70 if (content::IsBrowserSideNavigationEnabled())
61 return data_use_recorders_.end(); 71 return data_use_recorders_.end();
62 72
63 // If a DataUseRecorder has already been set as user data, then return that. 73 // If a DataUseRecorder has already been set as user data, then return that.
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 int old_render_frame_id, 401 int old_render_frame_id,
392 int new_render_process_id, 402 int new_render_process_id,
393 int new_render_frame_id) { 403 int new_render_frame_id) {
394 if (visible_main_render_frames_.find( 404 if (visible_main_render_frames_.find(
395 RenderFrameHostID(old_render_process_id, old_render_frame_id)) != 405 RenderFrameHostID(old_render_process_id, old_render_frame_id)) !=
396 visible_main_render_frames_.end()) { 406 visible_main_render_frames_.end()) {
397 WasShownOrHidden(new_render_process_id, new_render_frame_id, true); 407 WasShownOrHidden(new_render_process_id, new_render_frame_id, true);
398 } 408 }
399 } 409 }
400 410
411 void ChromeDataUseAscriber::RenderFrameHostChanged(int old_render_process_id,
RyanSturm 2016/12/16 16:26:10 You copied this method from above somehow I think.
Raj 2016/12/16 19:59:10 Oops. Should be due to rebase. Removed.
412 int old_render_frame_id,
413 int new_render_process_id,
414 int new_render_frame_id) {
415 if (visible_main_render_frames_.find(
416 RenderFrameHostID(old_render_process_id, old_render_frame_id)) !=
417 visible_main_render_frames_.end()) {
418 WasShownOrHidden(new_render_process_id, new_render_frame_id, true);
419 }
420 }
421
401 } // namespace data_use_measurement 422 } // namespace data_use_measurement
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698