| 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 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1345 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble( | 1345 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble( |
| 1346 std::move(chooser_bubble_delegate)); | 1346 std::move(chooser_bubble_delegate)); |
| 1347 | 1347 |
| 1348 return std::move(bluetooth_chooser_desktop); | 1348 return std::move(bluetooth_chooser_desktop); |
| 1349 } | 1349 } |
| 1350 | 1350 |
| 1351 void Browser::RequestAppBannerFromDevTools(content::WebContents* web_contents) { | 1351 void Browser::RequestAppBannerFromDevTools(content::WebContents* web_contents) { |
| 1352 banners::AppBannerManagerEmulation::CreateForWebContents(web_contents); | 1352 banners::AppBannerManagerEmulation::CreateForWebContents(web_contents); |
| 1353 banners::AppBannerManagerEmulation* manager = | 1353 banners::AppBannerManagerEmulation* manager = |
| 1354 banners::AppBannerManagerEmulation::FromWebContents(web_contents); | 1354 banners::AppBannerManagerEmulation::FromWebContents(web_contents); |
| 1355 manager->RequestAppBanner(web_contents->GetMainFrame(), | 1355 manager->RequestAppBanner(web_contents->GetLastCommittedURL(), true); |
| 1356 web_contents->GetLastCommittedURL(), true); | |
| 1357 } | 1356 } |
| 1358 | 1357 |
| 1359 bool Browser::IsMouseLocked() const { | 1358 bool Browser::IsMouseLocked() const { |
| 1360 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); | 1359 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); |
| 1361 } | 1360 } |
| 1362 | 1361 |
| 1363 void Browser::OnWindowDidShow() { | 1362 void Browser::OnWindowDidShow() { |
| 1364 if (window_has_shown_) | 1363 if (window_has_shown_) |
| 1365 return; | 1364 return; |
| 1366 window_has_shown_ = true; | 1365 window_has_shown_ = true; |
| (...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2603 if (contents && !allow_js_access) { | 2602 if (contents && !allow_js_access) { |
| 2604 contents->web_contents()->GetController().LoadURL( | 2603 contents->web_contents()->GetController().LoadURL( |
| 2605 target_url, | 2604 target_url, |
| 2606 content::Referrer(), | 2605 content::Referrer(), |
| 2607 ui::PAGE_TRANSITION_LINK, | 2606 ui::PAGE_TRANSITION_LINK, |
| 2608 std::string()); // No extra headers. | 2607 std::string()); // No extra headers. |
| 2609 } | 2608 } |
| 2610 | 2609 |
| 2611 return contents != NULL; | 2610 return contents != NULL; |
| 2612 } | 2611 } |
| OLD | NEW |