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

Side by Side Diff: chrome/browser/ui/extensions/hosted_app_browser_controller.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/extensions/hosted_app_browser_controller.h" 5 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ssl/connection_security_helper.h" 9 #include "chrome/browser/ssl/connection_security.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/browser/ui/host_desktop.h" 12 #include "chrome/browser/ui/host_desktop.h"
13 #include "chrome/browser/ui/location_bar/location_bar.h" 13 #include "chrome/browser/ui/location_bar/location_bar.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/browser/web_applications/web_app.h" 15 #include "chrome/browser/web_applications/web_app.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 17 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 #include "extensions/browser/extension_registry.h" 19 #include "extensions/browser/extension_registry.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 if (!extension || !web_contents) 85 if (!extension || !web_contents)
86 return false; 86 return false;
87 87
88 if (!extension->is_hosted_app()) 88 if (!extension->is_hosted_app())
89 return false; 89 return false;
90 90
91 // Don't show a location bar until a navigation has occurred. 91 // Don't show a location bar until a navigation has occurred.
92 if (web_contents->GetLastCommittedURL().is_empty()) 92 if (web_contents->GetLastCommittedURL().is_empty())
93 return false; 93 return false;
94 94
95 ConnectionSecurityHelper::SecurityLevel security_level = 95 connection_security::SecurityLevel security_level =
96 ConnectionSecurityHelper::GetSecurityLevelForWebContents(web_contents); 96 connection_security::GetSecurityLevelForWebContents(web_contents);
97 if (security_level == ConnectionSecurityHelper::SECURITY_ERROR) 97 if (security_level == connection_security::SECURITY_ERROR)
98 return true; 98 return true;
99 99
100 GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension); 100 GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension);
101 return !(IsSameOriginOrMoreSecure(launch_url, 101 return !(IsSameOriginOrMoreSecure(launch_url,
102 web_contents->GetVisibleURL()) && 102 web_contents->GetVisibleURL()) &&
103 IsSameOriginOrMoreSecure(launch_url, 103 IsSameOriginOrMoreSecure(launch_url,
104 web_contents->GetLastCommittedURL())); 104 web_contents->GetLastCommittedURL()));
105 } 105 }
106 106
107 void HostedAppBrowserController::UpdateLocationBarVisibility( 107 void HostedAppBrowserController::UpdateLocationBarVisibility(
108 bool animate) const { 108 bool animate) const {
109 if (!SupportsLocationBar()) 109 if (!SupportsLocationBar())
110 return; 110 return;
111 111
112 browser_->window()->GetLocationBar()->UpdateLocationBarVisibility( 112 browser_->window()->GetLocationBar()->UpdateLocationBarVisibility(
113 ShouldShowLocationBar(), animate); 113 ShouldShowLocationBar(), animate);
114 } 114 }
115 115
116 } // namespace extensions 116 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm ('k') | chrome/browser/ui/toolbar/test_toolbar_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698