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

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

Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 // Disallow drag-and-drop navigation for Settings windows which do not support 1298 // Disallow drag-and-drop navigation for Settings windows which do not support
1299 // external navigation. 1299 // external navigation.
1300 if ((operations_allowed & blink::WebDragOperationLink) && 1300 if ((operations_allowed & blink::WebDragOperationLink) &&
1301 chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(this)) { 1301 chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(this)) {
1302 return false; 1302 return false;
1303 } 1303 }
1304 return true; 1304 return true;
1305 } 1305 }
1306 1306
1307 content::SecurityStyle Browser::GetSecurityStyle(WebContents* web_contents) { 1307 content::SecurityStyle Browser::GetSecurityStyle(WebContents* web_contents) {
1308 return ConnectionSecurityHelper::GetSecurityStyleForWebContents(web_contents); 1308 return connection_security::GetSecurityStyleForWebContents(web_contents);
1309 } 1309 }
1310 1310
1311 bool Browser::IsMouseLocked() const { 1311 bool Browser::IsMouseLocked() const {
1312 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked(); 1312 return exclusive_access_manager_->mouse_lock_controller()->IsMouseLocked();
1313 } 1313 }
1314 1314
1315 void Browser::OnWindowDidShow() { 1315 void Browser::OnWindowDidShow() {
1316 if (window_has_shown_) 1316 if (window_has_shown_)
1317 return; 1317 return;
1318 window_has_shown_ = true; 1318 window_has_shown_ = true;
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
2624 if (contents && !allow_js_access) { 2624 if (contents && !allow_js_access) {
2625 contents->web_contents()->GetController().LoadURL( 2625 contents->web_contents()->GetController().LoadURL(
2626 target_url, 2626 target_url,
2627 content::Referrer(), 2627 content::Referrer(),
2628 ui::PAGE_TRANSITION_LINK, 2628 ui::PAGE_TRANSITION_LINK,
2629 std::string()); // No extra headers. 2629 std::string()); // No extra headers.
2630 } 2630 }
2631 2631
2632 return contents != NULL; 2632 return contents != NULL;
2633 } 2633 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698