OLD | NEW |
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_frame_host.h" | 10 #include "content/public/browser/render_frame_host.h" |
11 #include "content/public/browser/render_process_host.h" | 11 #include "content/public/browser/render_process_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_t, int32_t> RenderFrameHostID; | 18 typedef std::pair<int32_t, int32_t> RenderFrameHostID; |
19 typedef std::set<RenderFrameHostID> SingleTabIDSet; | 19 typedef std::set<RenderFrameHostID> SingleTabIDSet; |
20 base::LazyInstance<SingleTabIDSet> g_blocked_ids = LAZY_INSTANCE_INITIALIZER; | 20 base::LazyInstance<SingleTabIDSet>::DestructorAtExit g_blocked_ids = |
| 21 LAZY_INSTANCE_INITIALIZER; |
21 | 22 |
22 void AddPairOnIOThread(int32_t process_id, int32_t frame_routing_id) { | 23 void AddPairOnIOThread(int32_t process_id, int32_t frame_routing_id) { |
23 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 24 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
24 RenderFrameHostID single_tab_pair(process_id, frame_routing_id); | 25 RenderFrameHostID single_tab_pair(process_id, frame_routing_id); |
25 g_blocked_ids.Get().insert(single_tab_pair); | 26 g_blocked_ids.Get().insert(single_tab_pair); |
26 } | 27 } |
27 | 28 |
28 void RemovePairOnIOThread(int32_t process_id, int32_t frame_routing_id) { | 29 void RemovePairOnIOThread(int32_t process_id, int32_t frame_routing_id) { |
29 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | 30 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
30 RenderFrameHostID single_tab_pair(process_id, frame_routing_id); | 31 RenderFrameHostID single_tab_pair(process_id, frame_routing_id); |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 | 97 |
97 void SingleTabModeTabHelper::HandleOpenUrl(const BlockedWindowParams& params) { | 98 void SingleTabModeTabHelper::HandleOpenUrl(const BlockedWindowParams& params) { |
98 TabAndroid* tab = TabAndroid::FromWebContents(web_contents()); | 99 TabAndroid* tab = TabAndroid::FromWebContents(web_contents()); |
99 if (!tab) | 100 if (!tab) |
100 return; | 101 return; |
101 | 102 |
102 chrome::NavigateParams nav_params = | 103 chrome::NavigateParams nav_params = |
103 params.CreateNavigateParams(web_contents()); | 104 params.CreateNavigateParams(web_contents()); |
104 tab->HandlePopupNavigation(&nav_params); | 105 tab->HandlePopupNavigation(&nav_params); |
105 } | 106 } |
OLD | NEW |