OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 #include "content/browser/tab_contents/interstitial_page.h" | 136 #include "content/browser/tab_contents/interstitial_page.h" |
137 #include "content/browser/tab_contents/navigation_controller.h" | 137 #include "content/browser/tab_contents/navigation_controller.h" |
138 #include "content/browser/tab_contents/navigation_entry.h" | 138 #include "content/browser/tab_contents/navigation_entry.h" |
139 #include "content/browser/tab_contents/tab_contents_view.h" | 139 #include "content/browser/tab_contents/tab_contents_view.h" |
140 #include "content/browser/user_metrics.h" | 140 #include "content/browser/user_metrics.h" |
141 #include "content/common/content_restriction.h" | 141 #include "content/common/content_restriction.h" |
142 #include "content/common/content_switches.h" | 142 #include "content/common/content_switches.h" |
143 #include "content/common/notification_service.h" | 143 #include "content/common/notification_service.h" |
144 #include "content/common/page_transition_types.h" | 144 #include "content/common/page_transition_types.h" |
145 #include "content/common/page_zoom.h" | 145 #include "content/common/page_zoom.h" |
146 #include "content/common/view_messages.h" | |
147 #include "grit/chromium_strings.h" | 146 #include "grit/chromium_strings.h" |
148 #include "grit/generated_resources.h" | 147 #include "grit/generated_resources.h" |
149 #include "grit/locale_settings.h" | 148 #include "grit/locale_settings.h" |
150 #include "grit/theme_resources_standard.h" | 149 #include "grit/theme_resources_standard.h" |
151 #include "net/base/cookie_monster.h" | 150 #include "net/base/cookie_monster.h" |
152 #include "net/base/net_util.h" | 151 #include "net/base/net_util.h" |
153 #include "net/base/registry_controlled_domain.h" | 152 #include "net/base/registry_controlled_domain.h" |
154 #include "net/url_request/url_request_context.h" | 153 #include "net/url_request/url_request_context.h" |
155 #include "ui/base/animation/animation.h" | 154 #include "ui/base/animation/animation.h" |
156 #include "ui/base/l10n/l10n_util.h" | 155 #include "ui/base/l10n/l10n_util.h" |
(...skipping 3221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3378 !CommandLine::ForCurrentProcess()->HasSwitch( | 3377 !CommandLine::ForCurrentProcess()->HasSwitch( |
3379 switches::kDisablePopupBlocking)) { | 3378 switches::kDisablePopupBlocking)) { |
3380 // Unrequested popups from normal pages are constrained unless they're in | 3379 // Unrequested popups from normal pages are constrained unless they're in |
3381 // the whitelist. The popup owner will handle checking this. | 3380 // the whitelist. The popup owner will handle checking this. |
3382 GetConstrainingContentsWrapper(source_wrapper)-> | 3381 GetConstrainingContentsWrapper(source_wrapper)-> |
3383 blocked_content_tab_helper()-> | 3382 blocked_content_tab_helper()-> |
3384 AddPopup(new_wrapper, initial_pos, user_gesture); | 3383 AddPopup(new_wrapper, initial_pos, user_gesture); |
3385 return; | 3384 return; |
3386 } | 3385 } |
3387 | 3386 |
3388 RenderViewHost* view = new_contents->render_view_host(); | 3387 new_contents->render_view_host()->DisassociateFromPopupCount(); |
3389 view->Send(new ViewMsg_DisassociateFromPopupCount(view->routing_id())); | |
3390 } | 3388 } |
3391 | 3389 |
3392 browser::NavigateParams params(this, new_wrapper); | 3390 browser::NavigateParams params(this, new_wrapper); |
3393 params.source_contents = | 3391 params.source_contents = |
3394 source ? tabstrip_model()->GetTabContentsAt( | 3392 source ? tabstrip_model()->GetTabContentsAt( |
3395 tabstrip_model()->GetWrapperIndex(source)) | 3393 tabstrip_model()->GetWrapperIndex(source)) |
3396 : NULL; | 3394 : NULL; |
3397 params.disposition = disposition; | 3395 params.disposition = disposition; |
3398 params.window_bounds = initial_pos; | 3396 params.window_bounds = initial_pos; |
3399 params.window_action = browser::NavigateParams::SHOW_WINDOW; | 3397 params.window_action = browser::NavigateParams::SHOW_WINDOW; |
(...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5271 } else if (is_type_tabbed()) { | 5269 } else if (is_type_tabbed()) { |
5272 GlobalErrorService* service = | 5270 GlobalErrorService* service = |
5273 GlobalErrorServiceFactory::GetForProfile(profile()); | 5271 GlobalErrorServiceFactory::GetForProfile(profile()); |
5274 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5272 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
5275 if (error) { | 5273 if (error) { |
5276 error->ShowBubbleView(this); | 5274 error->ShowBubbleView(this); |
5277 did_show_bubble = true; | 5275 did_show_bubble = true; |
5278 } | 5276 } |
5279 } | 5277 } |
5280 } | 5278 } |
OLD | NEW |