OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "Chrome.h" | 10 #include "Chrome.h" |
(...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1328 } | 1328 } |
1329 | 1329 |
1330 bool WebFrameLoaderClient::ActionSpecifiesNavigationPolicy( | 1330 bool WebFrameLoaderClient::ActionSpecifiesNavigationPolicy( |
1331 const WebCore::NavigationAction& action, | 1331 const WebCore::NavigationAction& action, |
1332 WebNavigationPolicy* policy) { | 1332 WebNavigationPolicy* policy) { |
1333 if ((action.type() != NavigationTypeLinkClicked) || | 1333 if ((action.type() != NavigationTypeLinkClicked) || |
1334 !action.event()->isMouseEvent()) | 1334 !action.event()->isMouseEvent()) |
1335 return false; | 1335 return false; |
1336 | 1336 |
1337 const MouseEvent* event = static_cast<const MouseEvent*>(action.event()); | 1337 const MouseEvent* event = static_cast<const MouseEvent*>(action.event()); |
1338 #if defined(OS_WIN) || defined(OS_LINUX) | 1338 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD) |
1339 const bool new_tab_modifier = (event->button() == 1) || event->ctrlKey(); | 1339 const bool new_tab_modifier = (event->button() == 1) || event->ctrlKey(); |
1340 #elif defined(OS_MACOSX) | 1340 #elif defined(OS_MACOSX) |
1341 const bool new_tab_modifier = (event->button() == 1) || event->metaKey(); | 1341 const bool new_tab_modifier = (event->button() == 1) || event->metaKey(); |
1342 #endif | 1342 #endif |
1343 const bool shift = event->shiftKey(); | 1343 const bool shift = event->shiftKey(); |
1344 const bool alt = event->altKey(); | 1344 const bool alt = event->altKey(); |
1345 if (!new_tab_modifier && !shift && !alt) | 1345 if (!new_tab_modifier && !shift && !alt) |
1346 return false; | 1346 return false; |
1347 | 1347 |
1348 DCHECK(policy); | 1348 DCHECK(policy); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1383 WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate(); | 1383 WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate(); |
1384 if (d) | 1384 if (d) |
1385 d->NavigateBackForwardSoon(offset); | 1385 d->NavigateBackForwardSoon(offset); |
1386 } | 1386 } |
1387 | 1387 |
1388 PassOwnPtr<WebPluginLoadObserver> WebFrameLoaderClient::GetPluginLoadObserver()
{ | 1388 PassOwnPtr<WebPluginLoadObserver> WebFrameLoaderClient::GetPluginLoadObserver()
{ |
1389 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( | 1389 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( |
1390 webframe_->frame()->loader()->activeDocumentLoader()); | 1390 webframe_->frame()->loader()->activeDocumentLoader()); |
1391 return ds->releasePluginLoadObserver(); | 1391 return ds->releasePluginLoadObserver(); |
1392 } | 1392 } |
OLD | NEW |