| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 | 8 |
| 9 MSVC_PUSH_WARNING_LEVEL(0); | 9 MSVC_PUSH_WARNING_LEVEL(0); |
| 10 #include "AccessibilityObject.h" | 10 #include "AccessibilityObject.h" |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 delegate->CreateWebView(webview_, user_gesture, | 221 delegate->CreateWebView(webview_, user_gesture, |
| 222 (creator_url.is_valid() && creator_url.IsStandard()) ? | 222 (creator_url.is_valid() && creator_url.IsStandard()) ? |
| 223 creator_url : GURL())); | 223 creator_url : GURL())); |
| 224 if (!new_view) | 224 if (!new_view) |
| 225 return NULL; | 225 return NULL; |
| 226 | 226 |
| 227 // The request is empty when we are just being asked to open a blank window. | 227 // The request is empty when we are just being asked to open a blank window. |
| 228 // This corresponds to window.open(""), for example. | 228 // This corresponds to window.open(""), for example. |
| 229 if (!r.resourceRequest().isEmpty()) { | 229 if (!r.resourceRequest().isEmpty()) { |
| 230 WrappedResourceRequest request(r.resourceRequest()); | 230 WrappedResourceRequest request(r.resourceRequest()); |
| 231 new_view->main_frame()->LoadRequest(request); | 231 new_view->main_frame()->loadRequest(request); |
| 232 } | 232 } |
| 233 | 233 |
| 234 WebViewImpl* new_view_impl = static_cast<WebViewImpl*>(new_view); | 234 WebViewImpl* new_view_impl = static_cast<WebViewImpl*>(new_view); |
| 235 return new_view_impl->page(); | 235 return new_view_impl->page(); |
| 236 } | 236 } |
| 237 | 237 |
| 238 static inline bool CurrentEventShouldCauseBackgroundTab( | 238 static inline bool CurrentEventShouldCauseBackgroundTab( |
| 239 const WebInputEvent* input_event) { | 239 const WebInputEvent* input_event) { |
| 240 if (!input_event) | 240 if (!input_event) |
| 241 return false; | 241 return false; |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 break; | 632 break; |
| 633 default: | 633 default: |
| 634 NOTREACHED(); | 634 NOTREACHED(); |
| 635 } | 635 } |
| 636 } | 636 } |
| 637 | 637 |
| 638 info->itemHeight = popup_container->menuItemHeight(); | 638 info->itemHeight = popup_container->menuItemHeight(); |
| 639 info->selectedIndex = popup_container->selectedIndex(); | 639 info->selectedIndex = popup_container->selectedIndex(); |
| 640 info->items.swap(output_items); | 640 info->items.swap(output_items); |
| 641 } | 641 } |
| OLD | NEW |