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

Side by Side Diff: chrome/browser/android/data_usage/data_use_ui_tab_model.cc

Issue 1443683002: Notify DataUseTabModel of navigations and tab closures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 5 years, 1 month 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/android/data_usage/data_use_ui_tab_model.h" 5 #include "chrome/browser/android/data_usage/data_use_ui_tab_model.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/thread_task_runner_handle.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "url/gurl.h" 13 #include "url/gurl.h"
14 14
15 namespace chrome { 15 namespace chrome {
16 16
17 namespace android { 17 namespace android {
18 18
19 // TabObserverOnIOThread registers as an observer to
20 // DataUseTabModel::TabDataUseObserver, and gets notified when tracking has
21 // started and ended on a tab. It passes these notifications to
22 // DataUseUITabModel on UI thread. TabObserverOnIOThread is not thread safe,
23 // and should only be accessed only on IO thread.
24 class DataUseUITabModel::TabObserverOnIOThread
25 : public base::RefCountedThreadSafe<TabObserverOnIOThread>,
26 public DataUseTabModel::TabDataUseObserver {
27 public:
28 // Sets the |data_use_tab_model_|, and registers as an observer to
29 // |data_use_tab_model_|. Can be called at most once.
30 TabObserverOnIOThread(
sclittle 2015/11/19 21:53:24 Maybe this class isn't necessary. What if DataUseT
tbansal1 2015/11/20 21:34:05 Done.
31 const base::WeakPtr<DataUseUITabModel>& data_use_ui_tab_model,
32 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
33 const base::WeakPtr<DataUseTabModel>& data_use_tab_model);
34
35 private:
36 friend class DataUseUITabModelTest;
sclittle 2015/11/19 21:53:24 This friending does nothing, so remove it.
tbansal1 2015/11/20 21:34:05 Done.
37
38 // Ref counted classes have private destructors to avoid any code deleting
39 // the object accidentally while there are still references to it.
40 friend class base::RefCountedThreadSafe<TabObserverOnIOThread>;
41
42 ~TabObserverOnIOThread();
43
44 // DataUseTabModel::Observer implementation:
45 void NotifyTrackingStarting(int32_t tab_id) override;
46 void NotifyTrackingEnding(int32_t tab_id) override;
47
48 // |data_use_ui_tab_model_| is notified of starting and ending of tracking.
49 // |data_use_ui_tab_model_| should only be used on UI thread.
50 base::WeakPtr<DataUseUITabModel> data_use_ui_tab_model_;
51
52 // |this| registers as an observer to |data_use_tab_model_|.
53 base::WeakPtr<DataUseTabModel> data_use_tab_model_;
54
55 // Used to call methods on |data_use_ui_tab_model_|.
56 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
57
58 base::ThreadChecker thread_checker_;
59
60 DISALLOW_COPY_AND_ASSIGN(TabObserverOnIOThread);
61 };
62
19 DataUseUITabModel::DataUseUITabModel( 63 DataUseUITabModel::DataUseUITabModel(
20 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) 64 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
21 : io_task_runner_(io_task_runner) { 65 : io_task_runner_(io_task_runner), weak_factory_(this) {
66 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
22 DCHECK(io_task_runner_); 67 DCHECK(io_task_runner_);
23 } 68 }
24 69
25 DataUseUITabModel::~DataUseUITabModel() {} 70 DataUseUITabModel::~DataUseUITabModel() {
71 if (tab_data_use_observer_) {
72 DCHECK(thread_checker_.CalledOnValidThread());
73 tab_data_use_observer_->AddRef();
74
75 // Removes the last reference to |tab_observer|, so that it is destroyed on
76 // IO thread.
77 io_task_runner_->ReleaseSoon(FROM_HERE, tab_data_use_observer_.get());
sclittle 2015/11/19 21:53:24 I don't think this is safe - ReleaseSoon could fai
tbansal1 2015/11/20 21:34:05 Done.
78 tab_data_use_observer_ = nullptr;
79 }
80 }
26 81
27 void DataUseUITabModel::ReportBrowserNavigation( 82 void DataUseUITabModel::ReportBrowserNavigation(
28 const GURL& gurl, 83 const GURL& gurl,
29 ui::PageTransition page_transition, 84 ui::PageTransition page_transition,
30 int32_t tab_id) const { 85 int32_t tab_id) const {
31 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
32 DCHECK(thread_checker_.CalledOnValidThread()); 86 DCHECK(thread_checker_.CalledOnValidThread());
87 DCHECK_LE(0, tab_id);
33 88
34 // TODO(tbansal): Post to DataUseTabModel on IO thread. 89 DataUseTabModel::TransitionType transition_type;
90
91 if (ConvertTransitionType(page_transition, &transition_type)) {
92 io_task_runner_->PostTask(
93 FROM_HERE,
94 base::Bind(&DataUseTabModel::OnNavigationEvent, io_data_use_tab_model_,
95 tab_id, transition_type, gurl));
96 }
35 } 97 }
36 98
37 void DataUseUITabModel::ReportTabClosure(int32_t tab_id) { 99 void DataUseUITabModel::ReportTabClosure(int32_t tab_id) {
38 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
39 DCHECK(thread_checker_.CalledOnValidThread()); 100 DCHECK(thread_checker_.CalledOnValidThread());
101 DCHECK_LE(0, tab_id);
40 102
41 // TODO(tbansal): Post to DataUseTabModel on IO thread. 103 io_task_runner_->PostTask(FROM_HERE,
104 base::Bind(&DataUseTabModel::OnTabCloseEvent,
105 io_data_use_tab_model_, tab_id));
42 106
43 // Clear out local state. 107 // Clear out local state.
44 TabEvents::iterator it = tab_events_.find(tab_id); 108 TabEvents::iterator it = tab_events_.find(tab_id);
45 if (it == tab_events_.end()) 109 if (it == tab_events_.end())
46 return; 110 return;
47 tab_events_.erase(it); 111 tab_events_.erase(it);
48 } 112 }
49 113
50 void DataUseUITabModel::ReportCustomTabInitialNavigation( 114 void DataUseUITabModel::ReportCustomTabInitialNavigation(
51 int32_t tab_id, 115 int32_t tab_id,
52 const std::string& url, 116 const std::string& url,
53 const std::string& package_name) { 117 const std::string& package_name) {
118 DCHECK(thread_checker_.CalledOnValidThread());
54 // TODO(tbansal): Post to DataUseTabModel on IO thread. 119 // TODO(tbansal): Post to DataUseTabModel on IO thread.
55 } 120 }
56 121
57 void DataUseUITabModel::OnTrackingStarted(int32_t tab_id) { 122 void DataUseUITabModel::SetIODataUseTabModel(
58 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 123 const base::WeakPtr<DataUseTabModel>& io_data_use_tab_model) {
124 DCHECK(thread_checker_.CalledOnValidThread());
125 DCHECK(!io_data_use_tab_model_);
126
127 io_data_use_tab_model_ = io_data_use_tab_model;
128
129 base::PostTaskAndReplyWithResult(
130 io_task_runner_.get(), FROM_HERE,
131 base::Bind(&CreateTabObserverOnIOThread, io_data_use_tab_model_,
132 weak_factory_.GetWeakPtr(),
133 base::ThreadTaskRunnerHandle::Get()),
134 base::Bind(&DataUseUITabModel::SetTabDataUseObserver,
135 weak_factory_.GetWeakPtr()));
136 }
137
138 void DataUseUITabModel::NotifyTrackingStarting(int32_t tab_id) {
59 DCHECK(thread_checker_.CalledOnValidThread()); 139 DCHECK(thread_checker_.CalledOnValidThread());
60 140
61 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_STARTED)) 141 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_STARTED))
62 return; 142 return;
63 // Since tracking started before the UI could indicate that it ended, it is 143 // Since tracking started before the UI could indicate that it ended, it is
64 // not useful for UI to show that it started again. 144 // not useful for UI to show that it started again.
65 RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED); 145 RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED);
66 } 146 }
67 147
68 void DataUseUITabModel::OnTrackingEnded(int32_t tab_id) { 148 void DataUseUITabModel::NotifyTrackingEnding(int32_t tab_id) {
69 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
70 DCHECK(thread_checker_.CalledOnValidThread()); 149 DCHECK(thread_checker_.CalledOnValidThread());
71 150
72 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_ENDED)) 151 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_ENDED))
73 return; 152 return;
74 // Since tracking ended before the UI could indicate that it stated, it is not 153 // Since tracking ended before the UI could indicate that it stated, it is not
75 // useful for UI to show that it ended. 154 // useful for UI to show that it ended.
76 RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED); 155 RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED);
77 } 156 }
78 157
79 bool DataUseUITabModel::HasDataUseTrackingStarted(int32_t tab_id) { 158 bool DataUseUITabModel::HasDataUseTrackingStarted(int32_t tab_id) {
80 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
81 DCHECK(thread_checker_.CalledOnValidThread()); 159 DCHECK(thread_checker_.CalledOnValidThread());
82 160
83 TabEvents::iterator it = tab_events_.find(tab_id); 161 TabEvents::iterator it = tab_events_.find(tab_id);
84 if (it == tab_events_.end()) 162 if (it == tab_events_.end())
85 return false; 163 return false;
86 164
87 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED); 165 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED);
88 } 166 }
89 167
90 bool DataUseUITabModel::HasDataUseTrackingEnded(int32_t tab_id) { 168 bool DataUseUITabModel::HasDataUseTrackingEnded(int32_t tab_id) {
91 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
92 DCHECK(thread_checker_.CalledOnValidThread()); 169 DCHECK(thread_checker_.CalledOnValidThread());
93 170
94 TabEvents::iterator it = tab_events_.find(tab_id); 171 TabEvents::iterator it = tab_events_.find(tab_id);
95 if (it == tab_events_.end()) 172 if (it == tab_events_.end())
96 return false; 173 return false;
97 174
98 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED); 175 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED);
99 } 176 }
100 177
178 // static
179 scoped_refptr<DataUseUITabModel::TabObserverOnIOThread>
180 DataUseUITabModel::CreateTabObserverOnIOThread(
181 const base::WeakPtr<DataUseTabModel>& data_use_tab_model,
182 const base::WeakPtr<DataUseUITabModel>& data_use_ui_tab_model,
183 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
184 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
185
186 scoped_refptr<DataUseUITabModel::TabObserverOnIOThread> tab_observer(
187 new DataUseUITabModel::TabObserverOnIOThread(
188 data_use_ui_tab_model, ui_task_runner, data_use_tab_model));
189 return tab_observer;
190 }
191
192 void DataUseUITabModel::SetTabDataUseObserver(
193 scoped_refptr<TabObserverOnIOThread> tab_data_use_observer) {
194 DCHECK(thread_checker_.CalledOnValidThread());
195 DCHECK(!tab_data_use_observer_);
196 tab_data_use_observer_ = tab_data_use_observer;
197 DCHECK(tab_data_use_observer_);
198 }
199
101 bool DataUseUITabModel::MaybeCreateTabEvent(int32_t tab_id, 200 bool DataUseUITabModel::MaybeCreateTabEvent(int32_t tab_id,
102 DataUseTrackingEvent event) { 201 DataUseTrackingEvent event) {
103 TabEvents::iterator it = tab_events_.find(tab_id); 202 DCHECK(thread_checker_.CalledOnValidThread());
104 if (it == tab_events_.end()) { 203 return tab_events_.insert(std::make_pair(tab_id, event)).second;
105 tab_events_.insert(std::make_pair(tab_id, event));
106 return true;
107 }
108 return false;
109 } 204 }
110 205
111 bool DataUseUITabModel::RemoveTabEvent(int32_t tab_id, 206 bool DataUseUITabModel::RemoveTabEvent(int32_t tab_id,
112 DataUseTrackingEvent event) { 207 DataUseTrackingEvent event) {
208 DCHECK(thread_checker_.CalledOnValidThread());
113 TabEvents::iterator it = tab_events_.find(tab_id); 209 TabEvents::iterator it = tab_events_.find(tab_id);
114 DCHECK(it != tab_events_.end()); 210 DCHECK(it != tab_events_.end());
115 if (it->second == event) { 211 if (it->second == event) {
116 tab_events_.erase(it); 212 tab_events_.erase(it);
117 return true; 213 return true;
118 } 214 }
119 return false; 215 return false;
120 } 216 }
121 217
218 bool DataUseUITabModel::ConvertTransitionType(
219 ui::PageTransition page_transition,
220 DataUseTabModel::TransitionType* transition_type) const {
221 if (!ui::PageTransitionIsValidType(page_transition) ||
222 !ui::PageTransitionIsMainFrame(page_transition) ||
223 !ui::PageTransitionIsNewNavigation(page_transition)) {
224 return false;
225 }
226
227 const int32_t mask = 0xFFFFFFFF ^ ui::PAGE_TRANSITION_QUALIFIER_MASK;
228
229 switch (page_transition & mask) {
230 case ui::PAGE_TRANSITION_LINK:
231 if ((page_transition & ui::PAGE_TRANSITION_FROM_API) != 0) {
232 // Clicking on bookmarks.
233 *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
234 return true;
235 }
236 return false; // Newtab, clicking on a link.
237 case ui::PAGE_TRANSITION_TYPED:
238 *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION;
239 return true;
240 case ui::PAGE_TRANSITION_AUTO_BOOKMARK:
241 // Auto bookmark from newtab page.
242 *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
243 return true;
244 case ui::PAGE_TRANSITION_AUTO_TOPLEVEL:
245 // History menu.
246 *transition_type = DataUseTabModel::TRANSITION_HISTORY_ITEM;
247 return true;
248 case ui::PAGE_TRANSITION_GENERATED:
249 // Omnibox search (e.g., searching for "tacos").
250 *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_SEARCH;
251 return true;
252 case ui::PAGE_TRANSITION_RELOAD:
253 // Restored tabs.
254 return false;
255 default:
256 return false;
257 }
258 }
259
260 DataUseUITabModel::TabObserverOnIOThread::TabObserverOnIOThread(
261 const base::WeakPtr<DataUseUITabModel>& data_use_ui_tab_model,
262 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
263 const base::WeakPtr<DataUseTabModel>& data_use_tab_model)
264 : data_use_ui_tab_model_(data_use_ui_tab_model),
265 data_use_tab_model_(data_use_tab_model),
266 ui_task_runner_(ui_task_runner) {
267 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
268 DCHECK(ui_task_runner_);
269 if (data_use_tab_model_)
270 data_use_tab_model_->AddObserver(this);
271 }
272
273 DataUseUITabModel::TabObserverOnIOThread::~TabObserverOnIOThread() {
274 DCHECK(thread_checker_.CalledOnValidThread());
275 if (data_use_tab_model_)
276 data_use_tab_model_->RemoveObserver(this);
277 }
278
279 void DataUseUITabModel::TabObserverOnIOThread::NotifyTrackingStarting(
280 int32_t tab_id) {
281 DCHECK(thread_checker_.CalledOnValidThread());
282
283 ui_task_runner_->PostTask(
284 FROM_HERE, base::Bind(&DataUseUITabModel::NotifyTrackingStarting,
285 data_use_ui_tab_model_, tab_id));
286 }
287
288 void DataUseUITabModel::TabObserverOnIOThread::NotifyTrackingEnding(
289 int32_t tab_id) {
290 DCHECK(thread_checker_.CalledOnValidThread());
291
292 ui_task_runner_->PostTask(FROM_HERE,
293 base::Bind(&DataUseUITabModel::NotifyTrackingEnding,
294 data_use_ui_tab_model_, tab_id));
295 }
296
122 } // namespace android 297 } // namespace android
123 298
124 } // namespace chrome 299 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698