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

Side by Side Diff: chrome/browser/android/webapps/single_tab_mode_tab_helper.cc

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/webapps/single_tab_mode_tab_helper.h" 5 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "chrome/browser/android/tab_android.h" 8 #include "chrome/browser/android/tab_android.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/browser/render_process_host.h" 10 #include "content/public/browser/render_process_host.h"
11 #include "content/public/browser/render_view_host.h" 11 #include "content/public/browser/render_view_host.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 13
14 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SingleTabModeTabHelper); 14 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SingleTabModeTabHelper);
15 15
16 namespace { 16 namespace {
17 17
18 typedef std::pair<int32, int32> RenderWidgetHostID; 18 typedef std::pair<int32_t, int32_t> RenderWidgetHostID;
19 typedef std::set<RenderWidgetHostID> SingleTabIDSet; 19 typedef std::set<RenderWidgetHostID> SingleTabIDSet;
20 base::LazyInstance<SingleTabIDSet> g_blocked_ids = LAZY_INSTANCE_INITIALIZER; 20 base::LazyInstance<SingleTabIDSet> g_blocked_ids = LAZY_INSTANCE_INITIALIZER;
21 21
22 void AddPairOnIOThread(int32 process_id, int32 routing_id) { 22 void AddPairOnIOThread(int32_t process_id, int32_t routing_id) {
23 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 23 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
24 RenderWidgetHostID single_tab_pair(process_id, routing_id); 24 RenderWidgetHostID single_tab_pair(process_id, routing_id);
25 g_blocked_ids.Get().insert(single_tab_pair); 25 g_blocked_ids.Get().insert(single_tab_pair);
26 } 26 }
27 27
28 void RemovePairOnIOThread(int32 process_id, int32 routing_id) { 28 void RemovePairOnIOThread(int32_t process_id, int32_t routing_id) {
29 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 29 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
30 RenderWidgetHostID single_tab_pair(process_id, routing_id); 30 RenderWidgetHostID single_tab_pair(process_id, routing_id);
31 SingleTabIDSet::iterator itr = g_blocked_ids.Get().find(single_tab_pair); 31 SingleTabIDSet::iterator itr = g_blocked_ids.Get().find(single_tab_pair);
32 DCHECK(itr != g_blocked_ids.Get().end()); 32 DCHECK(itr != g_blocked_ids.Get().end());
33 g_blocked_ids.Get().erase(itr); 33 g_blocked_ids.Get().erase(itr);
34 } 34 }
35 35
36 void AddPair(content::RenderViewHost* render_view_host) { 36 void AddPair(content::RenderViewHost* render_view_host) {
37 if (!render_view_host) 37 if (!render_view_host)
38 return; 38 return;
39 39
40 int32 process_id = render_view_host->GetProcess()->GetID(); 40 int32_t process_id = render_view_host->GetProcess()->GetID();
41 int32 routing_id = render_view_host->GetRoutingID(); 41 int32_t routing_id = render_view_host->GetRoutingID();
42 content::BrowserThread::PostTask( 42 content::BrowserThread::PostTask(
43 content::BrowserThread::IO, FROM_HERE, 43 content::BrowserThread::IO, FROM_HERE,
44 base::Bind(&AddPairOnIOThread, process_id, routing_id)); 44 base::Bind(&AddPairOnIOThread, process_id, routing_id));
45 } 45 }
46 46
47 void RemovePair(content::RenderViewHost* render_view_host) { 47 void RemovePair(content::RenderViewHost* render_view_host) {
48 if (!render_view_host) 48 if (!render_view_host)
49 return; 49 return;
50 50
51 int32 process_id = render_view_host->GetProcess()->GetID(); 51 int32_t process_id = render_view_host->GetProcess()->GetID();
52 int32 routing_id = render_view_host->GetRoutingID(); 52 int32_t routing_id = render_view_host->GetRoutingID();
53 content::BrowserThread::PostTask( 53 content::BrowserThread::PostTask(
54 content::BrowserThread::IO, FROM_HERE, 54 content::BrowserThread::IO, FROM_HERE,
55 base::Bind(&RemovePairOnIOThread, process_id, routing_id)); 55 base::Bind(&RemovePairOnIOThread, process_id, routing_id));
56 } 56 }
57 57
58 } // namespace 58 } // namespace
59 59
60 SingleTabModeTabHelper::SingleTabModeTabHelper( 60 SingleTabModeTabHelper::SingleTabModeTabHelper(
61 content::WebContents* web_contents) 61 content::WebContents* web_contents)
62 : content::WebContentsObserver(web_contents), 62 : content::WebContentsObserver(web_contents),
(...skipping 15 matching lines...) Expand all
78 if (!block_all_new_windows_) 78 if (!block_all_new_windows_)
79 return; 79 return;
80 RemovePair(render_view_host); 80 RemovePair(render_view_host);
81 } 81 }
82 82
83 void SingleTabModeTabHelper::PermanentlyBlockAllNewWindows() { 83 void SingleTabModeTabHelper::PermanentlyBlockAllNewWindows() {
84 block_all_new_windows_ = true; 84 block_all_new_windows_ = true;
85 AddPair(web_contents()->GetRenderViewHost()); 85 AddPair(web_contents()->GetRenderViewHost());
86 } 86 }
87 87
88 bool SingleTabModeTabHelper::IsRegistered(int32 process_id, 88 bool SingleTabModeTabHelper::IsRegistered(int32_t process_id,
89 int32 routing_id) { 89 int32_t routing_id) {
90 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 90 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
91 RenderWidgetHostID single_tab_pair(process_id, routing_id); 91 RenderWidgetHostID single_tab_pair(process_id, routing_id);
92 SingleTabIDSet::iterator itr = g_blocked_ids.Get().find(single_tab_pair); 92 SingleTabIDSet::iterator itr = g_blocked_ids.Get().find(single_tab_pair);
93 return itr != g_blocked_ids.Get().end(); 93 return itr != g_blocked_ids.Get().end();
94 } 94 }
95 95
96 void SingleTabModeTabHelper::HandleOpenUrl(const BlockedWindowParams &params) { 96 void SingleTabModeTabHelper::HandleOpenUrl(const BlockedWindowParams &params) {
97 TabAndroid* tab = TabAndroid::FromWebContents(web_contents()); 97 TabAndroid* tab = TabAndroid::FromWebContents(web_contents());
98 if (!tab) 98 if (!tab)
99 return; 99 return;
100 100
101 chrome::NavigateParams nav_params = 101 chrome::NavigateParams nav_params =
102 params.CreateNavigateParams(web_contents()); 102 params.CreateNavigateParams(web_contents());
103 tab->HandlePopupNavigation(&nav_params); 103 tab->HandlePopupNavigation(&nav_params);
104 } 104 }
OLDNEW
« no previous file with comments | « chrome/browser/android/webapps/single_tab_mode_tab_helper.h ('k') | chrome/browser/android/webapps/webapp_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698