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

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: Remove unnecessary thread checks in the factory class Created 5 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 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"
11 #include "base/single_thread_task_runner.h" 10 #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 DataUseUITabModel::DataUseUITabModel( 19 DataUseUITabModel::DataUseUITabModel(
20 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) 20 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
21 : io_task_runner_(io_task_runner) { 21 : io_task_runner_(io_task_runner), weak_factory_(this) {
22 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
22 DCHECK(io_task_runner_); 23 DCHECK(io_task_runner_);
23 } 24 }
24 25
25 DataUseUITabModel::~DataUseUITabModel() {} 26 DataUseUITabModel::~DataUseUITabModel() {
27 DCHECK(thread_checker_.CalledOnValidThread());
28 }
26 29
27 void DataUseUITabModel::ReportBrowserNavigation( 30 void DataUseUITabModel::ReportBrowserNavigation(
28 const GURL& gurl, 31 const GURL& gurl,
29 ui::PageTransition page_transition, 32 ui::PageTransition page_transition,
30 int32_t tab_id) const { 33 SessionID::id_type tab_id) const {
31 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
32 DCHECK(thread_checker_.CalledOnValidThread()); 34 DCHECK(thread_checker_.CalledOnValidThread());
35 DCHECK_LE(0, tab_id);
33 36
34 // TODO(tbansal): Post to DataUseTabModel on IO thread. 37 DataUseTabModel::TransitionType transition_type;
38
39 if (ConvertTransitionType(page_transition, &transition_type)) {
40 io_task_runner_->PostTask(
41 FROM_HERE,
42 base::Bind(&DataUseTabModel::OnNavigationEvent, data_use_tab_model_,
43 tab_id, transition_type, gurl, std::string()));
44 }
35 } 45 }
36 46
37 void DataUseUITabModel::ReportTabClosure(int32_t tab_id) { 47 void DataUseUITabModel::ReportTabClosure(SessionID::id_type tab_id) {
38 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
39 DCHECK(thread_checker_.CalledOnValidThread()); 48 DCHECK(thread_checker_.CalledOnValidThread());
49 DCHECK_LE(0, tab_id);
40 50
41 // TODO(tbansal): Post to DataUseTabModel on IO thread. 51 io_task_runner_->PostTask(FROM_HERE,
52 base::Bind(&DataUseTabModel::OnTabCloseEvent,
53 data_use_tab_model_, tab_id));
42 54
43 // Clear out local state. 55 // Clear out local state.
44 TabEvents::iterator it = tab_events_.find(tab_id); 56 TabEvents::iterator it = tab_events_.find(tab_id);
45 if (it == tab_events_.end()) 57 if (it == tab_events_.end())
46 return; 58 return;
47 tab_events_.erase(it); 59 tab_events_.erase(it);
48 } 60 }
49 61
50 void DataUseUITabModel::ReportCustomTabInitialNavigation( 62 void DataUseUITabModel::ReportCustomTabInitialNavigation(
51 int32_t tab_id, 63 SessionID::id_type tab_id,
52 const std::string& url, 64 const std::string& url,
53 const std::string& package_name) { 65 const std::string& package_name) {
54 // TODO(tbansal): Post to DataUseTabModel on IO thread. 66 DCHECK(thread_checker_.CalledOnValidThread());
67
68 if (tab_id <= 0)
69 return;
70
71 io_task_runner_->PostTask(
72 FROM_HERE,
73 base::Bind(&DataUseTabModel::OnNavigationEvent, data_use_tab_model_,
74 tab_id, DataUseTabModel::TRANSITION_FROM_EXTERNAL_APP,
75 GURL(url), package_name));
55 } 76 }
56 77
57 void DataUseUITabModel::OnTrackingStarted(int32_t tab_id) { 78 void DataUseUITabModel::SetDataUseTabModel(
58 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 79 base::WeakPtr<DataUseTabModel> data_use_tab_model) {
80 DCHECK(thread_checker_.CalledOnValidThread());
81 data_use_tab_model_ = data_use_tab_model;
82 }
83
84 base::WeakPtr<DataUseUITabModel> DataUseUITabModel::GetWeakPtr() {
85 DCHECK(thread_checker_.CalledOnValidThread());
86 return weak_factory_.GetWeakPtr();
87 }
88
89 void DataUseUITabModel::NotifyTrackingStarting(SessionID::id_type tab_id) {
59 DCHECK(thread_checker_.CalledOnValidThread()); 90 DCHECK(thread_checker_.CalledOnValidThread());
60 91
61 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_STARTED)) 92 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_STARTED))
62 return; 93 return;
63 // Since tracking started before the UI could indicate that it ended, it is 94 // Since tracking started before the UI could indicate that it ended, it is
64 // not useful for UI to show that it started again. 95 // not useful for UI to show that it started again.
65 RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED); 96 RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED);
66 } 97 }
67 98
68 void DataUseUITabModel::OnTrackingEnded(int32_t tab_id) { 99 void DataUseUITabModel::NotifyTrackingEnding(SessionID::id_type tab_id) {
69 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
70 DCHECK(thread_checker_.CalledOnValidThread()); 100 DCHECK(thread_checker_.CalledOnValidThread());
71 101
72 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_ENDED)) 102 if (MaybeCreateTabEvent(tab_id, DATA_USE_TRACKING_ENDED))
73 return; 103 return;
74 // Since tracking ended before the UI could indicate that it stated, it is not 104 // Since tracking ended before the UI could indicate that it stated, it is not
75 // useful for UI to show that it ended. 105 // useful for UI to show that it ended.
76 RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED); 106 RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED);
77 } 107 }
78 108
79 bool DataUseUITabModel::HasDataUseTrackingStarted(int32_t tab_id) { 109 bool DataUseUITabModel::HasDataUseTrackingStarted(SessionID::id_type tab_id) {
80 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
81 DCHECK(thread_checker_.CalledOnValidThread()); 110 DCHECK(thread_checker_.CalledOnValidThread());
82 111
83 TabEvents::iterator it = tab_events_.find(tab_id); 112 TabEvents::iterator it = tab_events_.find(tab_id);
84 if (it == tab_events_.end()) 113 if (it == tab_events_.end())
85 return false; 114 return false;
86 115
87 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED); 116 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_STARTED);
88 } 117 }
89 118
90 bool DataUseUITabModel::HasDataUseTrackingEnded(int32_t tab_id) { 119 bool DataUseUITabModel::HasDataUseTrackingEnded(SessionID::id_type tab_id) {
91 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
92 DCHECK(thread_checker_.CalledOnValidThread()); 120 DCHECK(thread_checker_.CalledOnValidThread());
93 121
94 TabEvents::iterator it = tab_events_.find(tab_id); 122 TabEvents::iterator it = tab_events_.find(tab_id);
95 if (it == tab_events_.end()) 123 if (it == tab_events_.end())
96 return false; 124 return false;
97 125
98 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED); 126 return RemoveTabEvent(tab_id, DATA_USE_TRACKING_ENDED);
99 } 127 }
100 128
101 bool DataUseUITabModel::MaybeCreateTabEvent(int32_t tab_id, 129 bool DataUseUITabModel::MaybeCreateTabEvent(SessionID::id_type tab_id,
102 DataUseTrackingEvent event) { 130 DataUseTrackingEvent event) {
103 TabEvents::iterator it = tab_events_.find(tab_id); 131 DCHECK(thread_checker_.CalledOnValidThread());
104 if (it == tab_events_.end()) { 132 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 } 133 }
110 134
111 bool DataUseUITabModel::RemoveTabEvent(int32_t tab_id, 135 bool DataUseUITabModel::RemoveTabEvent(SessionID::id_type tab_id,
112 DataUseTrackingEvent event) { 136 DataUseTrackingEvent event) {
137 DCHECK(thread_checker_.CalledOnValidThread());
113 TabEvents::iterator it = tab_events_.find(tab_id); 138 TabEvents::iterator it = tab_events_.find(tab_id);
114 DCHECK(it != tab_events_.end()); 139 DCHECK(it != tab_events_.end());
115 if (it->second == event) { 140 if (it->second == event) {
116 tab_events_.erase(it); 141 tab_events_.erase(it);
117 return true; 142 return true;
118 } 143 }
119 return false; 144 return false;
120 } 145 }
121 146
147 bool DataUseUITabModel::ConvertTransitionType(
148 ui::PageTransition page_transition,
149 DataUseTabModel::TransitionType* transition_type) const {
150 if (!ui::PageTransitionIsMainFrame(page_transition) ||
151 !ui::PageTransitionIsNewNavigation(page_transition)) {
152 return false;
153 }
154
155 switch (page_transition & ui::PAGE_TRANSITION_CORE_MASK) {
156 case ui::PAGE_TRANSITION_LINK:
157 if ((page_transition & ui::PAGE_TRANSITION_FROM_API) != 0) {
158 // Clicking on bookmarks.
159 *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
160 return true;
161 }
162 return false; // Newtab, clicking on a link.
163 case ui::PAGE_TRANSITION_TYPED:
164 *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_NAVIGATION;
165 return true;
166 case ui::PAGE_TRANSITION_AUTO_BOOKMARK:
167 // Auto bookmark from newtab page.
168 *transition_type = DataUseTabModel::TRANSITION_BOOKMARK;
169 return true;
170 case ui::PAGE_TRANSITION_AUTO_TOPLEVEL:
171 // History menu.
172 *transition_type = DataUseTabModel::TRANSITION_HISTORY_ITEM;
173 return true;
174 case ui::PAGE_TRANSITION_GENERATED:
175 // Omnibox search (e.g., searching for "tacos").
176 *transition_type = DataUseTabModel::TRANSITION_OMNIBOX_SEARCH;
177 return true;
178 case ui::PAGE_TRANSITION_RELOAD:
179 // Restored tabs.
180 return false;
181 default:
182 return false;
183 }
184 }
185
122 } // namespace android 186 } // namespace android
123 187
124 } // namespace chrome 188 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698