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

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

Issue 63273002: Rename WebKit namespace to blink (part 4) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
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 "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.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/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/common/render_messages.h" 14 #include "chrome/common/render_messages.h"
15 #include "content/public/browser/navigation_controller.h" 15 #include "content/public/browser/navigation_controller.h"
16 #include "content/public/browser/navigation_details.h" 16 #include "content/public/browser/navigation_details.h"
17 #include "content/public/browser/navigation_entry.h" 17 #include "content/public/browser/navigation_entry.h"
18 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_contents_delegate.h" 20 #include "content/public/browser/web_contents_delegate.h"
21 #include "content/public/browser/web_contents_view.h" 21 #include "content/public/browser/web_contents_view.h"
22 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 22 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
23 23
24 #if defined(OS_ANDROID) 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 WebKit::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 {
35 BlockedRequest(const chrome::NavigateParams& params, 35 BlockedRequest(const chrome::NavigateParams& params,
36 const WebWindowFeatures& window_features) 36 const WebWindowFeatures& window_features)
37 : params(params), window_features(window_features) {} 37 : params(params), window_features(window_features) {}
38 38
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 std::map<int32, GURL> PopupBlockerTabHelper::GetBlockedPopupRequests() { 138 std::map<int32, GURL> PopupBlockerTabHelper::GetBlockedPopupRequests() {
139 std::map<int32, GURL> result; 139 std::map<int32, GURL> result;
140 for (IDMap<BlockedRequest, IDMapOwnPointer>::const_iterator iter( 140 for (IDMap<BlockedRequest, IDMapOwnPointer>::const_iterator iter(
141 &blocked_popups_); 141 &blocked_popups_);
142 !iter.IsAtEnd(); 142 !iter.IsAtEnd();
143 iter.Advance()) { 143 iter.Advance()) {
144 result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url; 144 result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url;
145 } 145 }
146 return result; 146 return result;
147 } 147 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698