| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1408 | 1408 |
| 1409 void Browser::ShowCertificateViewerInDevTools( | 1409 void Browser::ShowCertificateViewerInDevTools( |
| 1410 content::WebContents* web_contents, int cert_id) { | 1410 content::WebContents* web_contents, int cert_id) { |
| 1411 DevToolsWindow* devtools_window = | 1411 DevToolsWindow* devtools_window = |
| 1412 DevToolsWindow::GetInstanceForInspectedWebContents(web_contents); | 1412 DevToolsWindow::GetInstanceForInspectedWebContents(web_contents); |
| 1413 if (devtools_window) | 1413 if (devtools_window) |
| 1414 devtools_window->ShowCertificateViewer(cert_id); | 1414 devtools_window->ShowCertificateViewer(cert_id); |
| 1415 } | 1415 } |
| 1416 | 1416 |
| 1417 scoped_ptr<content::BluetoothChooser> Browser::RunBluetoothChooser( | 1417 scoped_ptr<content::BluetoothChooser> Browser::RunBluetoothChooser( |
| 1418 content::WebContents* web_contents, | 1418 content::RenderFrameHost* frame, |
| 1419 const content::BluetoothChooser::EventHandler& event_handler, | 1419 const content::BluetoothChooser::EventHandler& event_handler, |
| 1420 const url::Origin& origin) { | 1420 const url::Origin& origin) { |
| 1421 scoped_ptr<BluetoothChooserDesktop> bluetooth_chooser_desktop( | 1421 scoped_ptr<BluetoothChooserDesktop> bluetooth_chooser_desktop( |
| 1422 new BluetoothChooserDesktop(event_handler)); | 1422 new BluetoothChooserDesktop(event_handler)); |
| 1423 scoped_ptr<BluetoothChooserBubbleDelegate> bubble_delegate( | 1423 scoped_ptr<BluetoothChooserBubbleDelegate> bubble_delegate( |
| 1424 new BluetoothChooserBubbleDelegate(web_contents->GetMainFrame())); | 1424 new BluetoothChooserBubbleDelegate(frame)); |
| 1425 BluetoothChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get(); | 1425 BluetoothChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get(); |
| 1426 | 1426 |
| 1427 // Wire the ChooserBubbleDelegate to the BluetoothChooser. | 1427 // Wire the ChooserBubbleDelegate to the BluetoothChooser. |
| 1428 bluetooth_chooser_desktop->set_bluetooth_chooser_bubble_delegate( | 1428 bluetooth_chooser_desktop->set_bluetooth_chooser_bubble_delegate( |
| 1429 bubble_delegate_ptr); | 1429 bubble_delegate_ptr); |
| 1430 bubble_delegate->set_bluetooth_chooser(bluetooth_chooser_desktop.get()); | 1430 bubble_delegate->set_bluetooth_chooser(bluetooth_chooser_desktop.get()); |
| 1431 | 1431 |
| 1432 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); | 1432 Browser* browser = chrome::FindBrowserWithWebContents( |
| 1433 WebContents::FromRenderFrameHost(frame)); |
| 1433 BubbleReference bubble_controller = | 1434 BubbleReference bubble_controller = |
| 1434 browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate)); | 1435 browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate)); |
| 1435 bubble_delegate_ptr->set_bubble_controller(bubble_controller); | 1436 bubble_delegate_ptr->set_bubble_controller(bubble_controller); |
| 1436 | 1437 |
| 1437 return std::move(bluetooth_chooser_desktop); | 1438 return std::move(bluetooth_chooser_desktop); |
| 1438 } | 1439 } |
| 1439 | 1440 |
| 1440 bool Browser::RequestAppBanner(content::WebContents* web_contents) { | 1441 bool Browser::RequestAppBanner(content::WebContents* web_contents) { |
| 1441 banners::AppBannerManagerDesktop* manager = | 1442 banners::AppBannerManagerDesktop* manager = |
| 1442 banners::AppBannerManagerDesktop::FromWebContents(web_contents); | 1443 banners::AppBannerManagerDesktop::FromWebContents(web_contents); |
| (...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2730 if (contents && !allow_js_access) { | 2731 if (contents && !allow_js_access) { |
| 2731 contents->web_contents()->GetController().LoadURL( | 2732 contents->web_contents()->GetController().LoadURL( |
| 2732 target_url, | 2733 target_url, |
| 2733 content::Referrer(), | 2734 content::Referrer(), |
| 2734 ui::PAGE_TRANSITION_LINK, | 2735 ui::PAGE_TRANSITION_LINK, |
| 2735 std::string()); // No extra headers. | 2736 std::string()); // No extra headers. |
| 2736 } | 2737 } |
| 2737 | 2738 |
| 2738 return contents != NULL; | 2739 return contents != NULL; |
| 2739 } | 2740 } |
| OLD | NEW |