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

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

Powered by Google App Engine
This is Rietveld 408576698