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

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 sclittle 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 <stdint.h>
8
7 #include <utility> 9 #include <utility>
8 10
9 #include "base/logging.h" 11 #include "base/logging.h"
10 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
11 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/thread_task_runner_handle.h"
15 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
16 #include "chrome/browser/io_thread.h"
12 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
13 #include "url/gurl.h" 18 #include "url/gurl.h"
14 19
15 namespace chrome { 20 namespace chrome {
16 21
17 namespace android { 22 namespace android {
18 23
24 namespace {
25
26 // Returns the weak pointer to DataUseTabModel which can be used on IO thread.
27 base::WeakPtr<DataUseTabModel> GetDataUseTabModel(
28 base::WeakPtr<DataUseUITabModel> tab_model,
29 IOThread* io_thread) {
30 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
31 return io_thread->globals()
sclittle 2015/11/24 04:11:51 Could it be possible for io_thread->globals() to h
tbansal1 2015/11/24 20:01:12 Obsolete.
32 ->external_data_use_observer->data_use_tab_model_weak_ptr();
33 }
34
35 } // namespace
36
19 DataUseUITabModel::DataUseUITabModel( 37 DataUseUITabModel::DataUseUITabModel(
20 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) 38 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
21 : io_task_runner_(io_task_runner) { 39 : io_task_runner_(io_task_runner), weak_factory_(this) {
40 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
22 DCHECK(io_task_runner_); 41 DCHECK(io_task_runner_);
23 } 42 }
24 43
25 DataUseUITabModel::~DataUseUITabModel() {} 44 DataUseUITabModel::~DataUseUITabModel() {
45 DCHECK(thread_checker_.CalledOnValidThread());
46
47 io_task_runner_->PostTask(
48 FROM_HERE,
49 base::Bind(&DataUseTabModel::RemoveObserver, data_use_tab_model_, this));
50 }
26 51
27 void DataUseUITabModel::ReportBrowserNavigation( 52 void DataUseUITabModel::ReportBrowserNavigation(
28 const GURL& gurl, 53 const GURL& gurl,
29 ui::PageTransition page_transition, 54 ui::PageTransition page_transition,
30 int32_t tab_id) const { 55 SessionID::id_type tab_id) const {
31 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
32 DCHECK(thread_checker_.CalledOnValidThread()); 56 DCHECK(thread_checker_.CalledOnValidThread());
57 DCHECK_LE(0, tab_id);
33 58
34 // TODO(tbansal): Post to DataUseTabModel on IO thread. 59 DataUseTabModel::TransitionType transition_type;
60
61 if (ConvertTransitionType(page_transition, &transition_type)) {
62 io_task_runner_->PostTask(
63 FROM_HERE,
64 base::Bind(&DataUseTabModel::OnNavigationEvent, data_use_tab_model_,
65 tab_id, transition_type, gurl, std::string()));
66 }
35 } 67 }
36 68
37 void DataUseUITabModel::ReportTabClosure(int32_t tab_id) { 69 void DataUseUITabModel::ReportTabClosure(SessionID::id_type tab_id) {
38 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
39 DCHECK(thread_checker_.CalledOnValidThread()); 70 DCHECK(thread_checker_.CalledOnValidThread());
71 DCHECK_LE(0, tab_id);
40 72
41 // TODO(tbansal): Post to DataUseTabModel on IO thread. 73 io_task_runner_->PostTask(FROM_HERE,
74 base::Bind(&DataUseTabModel::OnTabCloseEvent,
75 data_use_tab_model_, tab_id));
42 76
43 // Clear out local state. 77 // Clear out local state.
44 TabEvents::iterator it = tab_events_.find(tab_id); 78 TabEvents::iterator it = tab_events_.find(tab_id);
45 if (it == tab_events_.end()) 79 if (it == tab_events_.end())
46 return; 80 return;
47 tab_events_.erase(it); 81 tab_events_.erase(it);
48 } 82 }
49 83
50 void DataUseUITabModel::ReportCustomTabInitialNavigation( 84 void DataUseUITabModel::ReportCustomTabInitialNavigation(
51 int32_t tab_id, 85 SessionID::id_type tab_id,
52 const std::string& url, 86 const std::string& url,
53 const std::string& package_name) { 87 const std::string& package_name) {
54 // TODO(tbansal): Post to DataUseTabModel on IO thread. 88 DCHECK(thread_checker_.CalledOnValidThread());
89
90 if (tab_id <= 0)
91 return;
92
93 io_task_runner_->PostTask(
94 FROM_HERE,
95 base::Bind(&DataUseTabModel::OnNavigationEvent, data_use_tab_model_,
96 tab_id, DataUseTabModel::TRANSITION_FROM_EXTERNAL_APP,
97 GURL(url), package_name));
55 } 98 }
56 99
57 void DataUseUITabModel::OnTrackingStarted(int32_t tab_id) { 100 void DataUseUITabModel::SetIOThread(IOThread* io_thread) {
58 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 101 DCHECK(thread_checker_.CalledOnValidThread());
102
103 PostTaskAndReplyWithResult(
104 io_task_runner_.get(), FROM_HERE,
105 base::Bind(&GetDataUseTabModel, weak_factory_.GetWeakPtr(), io_thread),
106 base::Bind(&DataUseUITabModel::SetDataUseTabModel,
107 weak_factory_.GetWeakPtr()));
108 }
109
110 void DataUseUITabModel::SetDataUseTabModel(
111 base::WeakPtr<DataUseTabModel> data_use_tab_model) {
112 DCHECK(thread_checker_.CalledOnValidThread());
113
114 data_use_tab_model_ = data_use_tab_model;
115 io_task_runner_->PostTask(
116 FROM_HERE, base::Bind(&DataUseTabModel::AddObserver, data_use_tab_model_,
117 this, weak_factory_.GetWeakPtr()));
118 }
119
120 void DataUseUITabModel::NotifyTrackingStarting(SessionID::id_type tab_id) {
59 DCHECK(thread_checker_.CalledOnValidThread()); 121 DCHECK(thread_checker_.CalledOnValidThread());
60 122
61 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_STARTED)) 123 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_STARTED))
62 return; 124 return;
63 // Since tracking started before the UI could indicate that it ended, it is 125 // Since tracking started before the UI could indicate that it ended, it is
64 // not useful for UI to show that it started again. 126 // not useful for UI to show that it started again.
65 RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED); 127 RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED);
66 } 128 }
67 129
68 void DataUseUITabModel::OnTrackingEnded(int32_t tab_id) { 130 void DataUseUITabModel::NotifyTrackingEnding(SessionID::id_type tab_id) {
69 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
70 DCHECK(thread_checker_.CalledOnValidThread()); 131 DCHECK(thread_checker_.CalledOnValidThread());
71 132
72 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_ENDED)) 133 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_ENDED))
73 return; 134 return;
74 // Since tracking ended before the UI could indicate that it stated, it is not 135 // Since tracking ended before the UI could indicate that it stated, it is not
75 // useful for UI to show that it ended. 136 // useful for UI to show that it ended.
76 RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED); 137 RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED);
77 } 138 }
78 139
79 bool DataUseUITabModel::HasDataUseTrackingStarted(int32_t tab_id) { 140 bool DataUseUITabModel::HasDataUseTrackingStarted(SessionID::id_type tab_id) {
80 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
81 DCHECK(thread_checker_.CalledOnValidThread()); 141 DCHECK(thread_checker_.CalledOnValidThread());
82 142
83 TabEvents::iterator it = tab_events_.find(tab_id); 143 TabEvents::iterator it = tab_events_.find(tab_id);
84 if (it == tab_events_.end()) 144 if (it == tab_events_.end())
85 return false; 145 return false;
86 146
87 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED); 147 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED);
88 } 148 }
89 149
90 bool DataUseUITabModel::HasDataUseTrackingEnded(int32_t tab_id) { 150 bool DataUseUITabModel::HasDataUseTrackingEnded(SessionID::id_type tab_id) {
91 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
92 DCHECK(thread_checker_.CalledOnValidThread()); 151 DCHECK(thread_checker_.CalledOnValidThread());
93 152
94 TabEvents::iterator it = tab_events_.find(tab_id); 153 TabEvents::iterator it = tab_events_.find(tab_id);
95 if (it == tab_events_.end()) 154 if (it == tab_events_.end())
96 return false; 155 return false;
97 156
98 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED); 157 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED);
99 } 158 }
100 159
101 bool DataUseUITabModel::MaybeCreateTabEvent(int32_t tab_id, 160 bool DataUseUITabModel::MaybeCreateTabEvent(SessionID::id_type tab_id,
102 DataUseTrackingEvent event) { 161 DataUseTrackingEvent event) {
103 TabEvents::iterator it = tab_events_.find(tab_id); 162 DCHECK(thread_checker_.CalledOnValidThread());
104 if (it == tab_events_.end()) { 163 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 } 164 }
110 165
111 bool DataUseUITabModel::RemoveTabEvent(int32_t tab_id, 166 bool DataUseUITabModel::RemoveTabEvent(SessionID::id_type tab_id,
112 DataUseTrackingEvent event) { 167 DataUseTrackingEvent event) {
168 DCHECK(thread_checker_.CalledOnValidThread());
113 TabEvents::iterator it = tab_events_.find(tab_id); 169 TabEvents::iterator it = tab_events_.find(tab_id);
114 DCHECK(it != tab_events_.end()); 170 DCHECK(it != tab_events_.end());
115 if (it->second == event) { 171 if (it->second == event) {
116 tab_events_.erase(it); 172 tab_events_.erase(it);
117 return true; 173 return true;
118 } 174 }
119 return false; 175 return false;
120 } 176 }
121 177
178 bool DataUseUITabModel::ConvertTransitionType(
179 ui::PageTransition page_transition,
180 DataUseTabModel::TransitionType* transition_type) const {
181 if (!ui::PageTransitionIsMainFrame(page_transition) ||
182 !ui::PageTransitionIsNewNavigation(page_transition)) {
183 return false;
184 }
185
186 const int32_t mask = 0xFFFFFFFF ^ ui::PAGE_TRANSITION_QUALIFIER_MASK;
187
188 switch (page_transition & mask) {
189 case ui::PAGE_TRANSITION_LINK:
190 if ((page_transition & ui::PAGE_TRANSITION_FROM_API) != 0) {
191 // Clicking on bookmarks.
192 *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
193 return true;
194 }
195 return false; // Newtab, clicking on a link.
196 case ui::PAGE_TRANSITION_TYPED:
197 *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION;
198 return true;
199 case ui::PAGE_TRANSITION_AUTO_BOOKMARK:
200 // Auto bookmark from newtab page.
201 *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
202 return true;
203 case ui::PAGE_TRANSITION_AUTO_TOPLEVEL:
204 // History menu.
205 *transition_type = DataUseTabModel::TRANSITION_HISTORY_ITEM;
206 return true;
207 case ui::PAGE_TRANSITION_GENERATED:
208 // Omnibox search (e.g., searching for "tacos").
209 *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_SEARCH;
210 return true;
211 case ui::PAGE_TRANSITION_RELOAD:
212 // Restored tabs.
213 return false;
214 default:
215 return false;
216 }
217 }
218
122 } // namespace android 219 } // namespace android
123 220
124 } // namespace chrome 221 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698