Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1523 | 1523 |
| 1524 void WebContentsImpl::RequestMediaAccessPermission( | 1524 void WebContentsImpl::RequestMediaAccessPermission( |
| 1525 const content::MediaStreamRequest* request, | 1525 const content::MediaStreamRequest* request, |
| 1526 const content::MediaResponseCallback& callback) { | 1526 const content::MediaResponseCallback& callback) { |
| 1527 if (delegate_) | 1527 if (delegate_) |
| 1528 delegate_->RequestMediaAccessPermission(this, request, callback); | 1528 delegate_->RequestMediaAccessPermission(this, request, callback); |
| 1529 else | 1529 else |
| 1530 callback.Run(content::MediaStreamDevices()); | 1530 callback.Run(content::MediaStreamDevices()); |
| 1531 } | 1531 } |
| 1532 | 1532 |
| 1533 void WebContentsImpl::RequestAutocomplete() { | |
| 1534 if (delegate_) | |
| 1535 delegate_->RequestAutocomplete(this); | |
|
Dan Beam
2012/10/24 20:48:35
not sure what to do without a delegate here...
Evan Stade
2012/10/24 21:59:44
as above in RequestMediaAccessPermission, you shou
Dan Beam
2012/10/26 03:06:05
triggering a cancel now
| |
| 1536 } | |
| 1537 | |
| 1533 #if defined(OS_ANDROID) | 1538 #if defined(OS_ANDROID) |
| 1534 void WebContentsImpl::AttachLayer(WebKit::WebLayer* layer) { | 1539 void WebContentsImpl::AttachLayer(WebKit::WebLayer* layer) { |
| 1535 if (delegate_) | 1540 if (delegate_) |
| 1536 delegate_->AttachLayer(this, layer); | 1541 delegate_->AttachLayer(this, layer); |
| 1537 } | 1542 } |
| 1538 | 1543 |
| 1539 void WebContentsImpl::RemoveLayer(WebKit::WebLayer* layer) { | 1544 void WebContentsImpl::RemoveLayer(WebKit::WebLayer* layer) { |
| 1540 if (delegate_) | 1545 if (delegate_) |
| 1541 delegate_->RemoveLayer(this, layer); | 1546 delegate_->RemoveLayer(this, layer); |
| 1542 } | 1547 } |
| (...skipping 1885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3428 } | 3433 } |
| 3429 } | 3434 } |
| 3430 | 3435 |
| 3431 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { | 3436 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { |
| 3432 return browser_plugin_guest_.get(); | 3437 return browser_plugin_guest_.get(); |
| 3433 } | 3438 } |
| 3434 | 3439 |
| 3435 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { | 3440 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { |
| 3436 return browser_plugin_embedder_.get(); | 3441 return browser_plugin_embedder_.get(); |
| 3437 } | 3442 } |
| OLD | NEW |