Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 1162663004: Introduce browser-side plumbing for sending the lock icon status to DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased onto latest master. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 blink::WebDragOperationsMask operations_allowed) { 1294 blink::WebDragOperationsMask operations_allowed) {
1295 // Disallow drag-and-drop navigation for Settings windows which do not support 1295 // Disallow drag-and-drop navigation for Settings windows which do not support
1296 // external navigation. 1296 // external navigation.
1297 if ((operations_allowed & blink::WebDragOperationLink) && 1297 if ((operations_allowed & blink::WebDragOperationLink) &&
1298 chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(this)) { 1298 chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(this)) {
1299 return false; 1299 return false;
1300 } 1300 }
1301 return true; 1301 return true;
1302 } 1302 }
1303 1303
1304 content::SecurityStyle Browser::GetSecurityStyle(
1305 const WebContents* web_contents) {
1306 return ConnectionSecurityHelper::GetSecurityStyleForWebContents(web_contents);
1307 }
1308
1304 bool Browser::IsMouseLocked() const { 1309 bool Browser::IsMouseLocked() const {
1305 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); 1310 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked();
1306 } 1311 }
1307 1312
1308 void Browser::OnWindowDidShow() { 1313 void Browser::OnWindowDidShow() {
1309 if (window_has_shown_) 1314 if (window_has_shown_)
1310 return; 1315 return;
1311 window_has_shown_ = true; 1316 window_has_shown_ = true;
1312 1317
1313 // CurrentProcessInfo::CreationTime() is missing on some platforms. 1318 // CurrentProcessInfo::CreationTime() is missing on some platforms.
(...skipping 1304 matching lines...) Expand 10 before | Expand all | Expand 10 after
2618 if (contents && !allow_js_access) { 2623 if (contents && !allow_js_access) {
2619 contents->web_contents()->GetController().LoadURL( 2624 contents->web_contents()->GetController().LoadURL(
2620 target_url, 2625 target_url,
2621 content::Referrer(), 2626 content::Referrer(),
2622 ui::PAGE_TRANSITION_LINK, 2627 ui::PAGE_TRANSITION_LINK,
2623 std::string()); // No extra headers. 2628 std::string()); // No extra headers.
2624 } 2629 }
2625 2630
2626 return contents != NULL; 2631 return contents != NULL;
2627 } 2632 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698