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

Side by Side Diff: chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Created 3 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/ui/blocked_content/popup_blocker_tab_helper.h" 5 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" 11 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
12 #include "chrome/browser/ui/browser_navigator.h" 12 #include "chrome/browser/ui/browser_navigator.h"
13 #include "chrome/browser/ui/browser_navigator_params.h" 13 #include "chrome/browser/ui/browser_navigator_params.h"
14 #include "chrome/common/features.h" 14 #include "chrome/common/features.h"
15 #include "chrome/common/render_messages.h" 15 #include "chrome/common/render_messages.h"
16 #include "components/content_settings/core/browser/host_content_settings_map.h" 16 #include "components/content_settings/core/browser/host_content_settings_map.h"
17 #include "content/public/browser/navigation_controller.h" 17 #include "content/public/browser/navigation_controller.h"
18 #include "content/public/browser/navigation_details.h" 18 #include "content/public/browser/navigation_details.h"
19 #include "content/public/browser/navigation_entry.h" 19 #include "content/public/browser/navigation_entry.h"
20 #include "content/public/browser/render_view_host.h" 20 #include "content/public/browser/render_view_host.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 22 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
23 23
24 #if BUILDFLAG(ANDROID_JAVA_UI) 24 #if defined(OS_ANDROID)
25 #include "chrome/browser/ui/android/tab_model/tab_model_list.h" 25 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
26 #endif 26 #endif
27 27
28 using blink::WebWindowFeatures; 28 using blink::WebWindowFeatures;
29 29
30 const size_t kMaximumNumberOfPopups = 25; 30 const size_t kMaximumNumberOfPopups = 25;
31 31
32 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PopupBlockerTabHelper); 32 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PopupBlockerTabHelper);
33 33
34 struct PopupBlockerTabHelper::BlockedRequest { 34 struct PopupBlockerTabHelper::BlockedRequest {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 TabSpecificContentSettings::FromWebContents(web_contents())-> 114 TabSpecificContentSettings::FromWebContents(web_contents())->
115 OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS); 115 OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS);
116 } 116 }
117 117
118 void PopupBlockerTabHelper::ShowBlockedPopup(int32_t id) { 118 void PopupBlockerTabHelper::ShowBlockedPopup(int32_t id) {
119 BlockedRequest* popup = blocked_popups_.Lookup(id); 119 BlockedRequest* popup = blocked_popups_.Lookup(id);
120 if (!popup) 120 if (!popup)
121 return; 121 return;
122 // We set user_gesture to true here, so the new popup gets correctly focused. 122 // We set user_gesture to true here, so the new popup gets correctly focused.
123 popup->params.user_gesture = true; 123 popup->params.user_gesture = true;
124 #if BUILDFLAG(ANDROID_JAVA_UI) 124 #if defined(OS_ANDROID)
125 TabModelList::HandlePopupNavigation(&popup->params); 125 TabModelList::HandlePopupNavigation(&popup->params);
126 #else 126 #else
127 chrome::Navigate(&popup->params); 127 chrome::Navigate(&popup->params);
128 #endif 128 #endif
129 if (popup->params.target_contents) { 129 if (popup->params.target_contents) {
130 popup->params.target_contents->Send(new ChromeViewMsg_SetWindowFeatures( 130 popup->params.target_contents->Send(new ChromeViewMsg_SetWindowFeatures(
131 popup->params.target_contents->GetRenderViewHost()->GetRoutingID(), 131 popup->params.target_contents->GetRenderViewHost()->GetRoutingID(),
132 popup->window_features)); 132 popup->window_features));
133 } 133 }
134 blocked_popups_.Remove(id); 134 blocked_popups_.Remove(id);
135 if (blocked_popups_.IsEmpty()) 135 if (blocked_popups_.IsEmpty())
136 PopupNotificationVisibilityChanged(false); 136 PopupNotificationVisibilityChanged(false);
137 } 137 }
138 138
139 size_t PopupBlockerTabHelper::GetBlockedPopupsCount() const { 139 size_t PopupBlockerTabHelper::GetBlockedPopupsCount() const {
140 return blocked_popups_.size(); 140 return blocked_popups_.size();
141 } 141 }
142 142
143 PopupBlockerTabHelper::PopupIdMap 143 PopupBlockerTabHelper::PopupIdMap
144 PopupBlockerTabHelper::GetBlockedPopupRequests() { 144 PopupBlockerTabHelper::GetBlockedPopupRequests() {
145 PopupIdMap result; 145 PopupIdMap result;
146 for (IDMap<std::unique_ptr<BlockedRequest>>::const_iterator iter( 146 for (IDMap<std::unique_ptr<BlockedRequest>>::const_iterator iter(
147 &blocked_popups_); 147 &blocked_popups_);
148 !iter.IsAtEnd(); 148 !iter.IsAtEnd();
149 iter.Advance()) { 149 iter.Advance()) {
150 result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url; 150 result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url;
151 } 151 }
152 return result; 152 return result;
153 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698