OLD | NEW |
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/security_state_model.h" | 9 #include "chrome/browser/ssl/chrome_security_state_model_delegate.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 Loading... |
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 const SecurityStateModel* model = | 95 const ChromeSecurityStateModelDelegate* model_delegate = |
96 SecurityStateModel::FromWebContents(web_contents); | 96 ChromeSecurityStateModelDelegate::FromWebContents(web_contents); |
97 if (model && | 97 if (model_delegate && |
98 model->GetSecurityInfo().security_level == | 98 model_delegate->GetSecurityInfo().security_level == |
99 SecurityStateModel::SECURITY_ERROR) | 99 security_state::SECURITY_ERROR) |
100 return true; | 100 return true; |
101 | 101 |
102 GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension); | 102 GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension); |
103 return !(IsSameOriginOrMoreSecure(launch_url, | 103 return !(IsSameOriginOrMoreSecure(launch_url, |
104 web_contents->GetVisibleURL()) && | 104 web_contents->GetVisibleURL()) && |
105 IsSameOriginOrMoreSecure(launch_url, | 105 IsSameOriginOrMoreSecure(launch_url, |
106 web_contents->GetLastCommittedURL())); | 106 web_contents->GetLastCommittedURL())); |
107 } | 107 } |
108 | 108 |
109 void HostedAppBrowserController::UpdateLocationBarVisibility( | 109 void HostedAppBrowserController::UpdateLocationBarVisibility( |
110 bool animate) const { | 110 bool animate) const { |
111 if (!SupportsLocationBar()) | 111 if (!SupportsLocationBar()) |
112 return; | 112 return; |
113 | 113 |
114 browser_->window()->GetLocationBar()->UpdateLocationBarVisibility( | 114 browser_->window()->GetLocationBar()->UpdateLocationBarVisibility( |
115 ShouldShowLocationBar(), animate); | 115 ShouldShowLocationBar(), animate); |
116 } | 116 } |
117 | 117 |
118 } // namespace extensions | 118 } // namespace extensions |
OLD | NEW |