OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_frame/ready_mode/ready_mode.h" | 5 #include "chrome_frame/ready_mode/ready_mode.h" |
6 | 6 |
7 #include <atlbase.h> | 7 #include <atlbase.h> |
8 #include <shlguid.h> | 8 #include <shlguid.h> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 BrowserObserver::BrowserObserver(ready_mode::Delegate* chrome_frame, | 152 BrowserObserver::BrowserObserver(ready_mode::Delegate* chrome_frame, |
153 IWebBrowser2* web_browser, | 153 IWebBrowser2* web_browser, |
154 ReadyModeWebBrowserAdapter* adapter) | 154 ReadyModeWebBrowserAdapter* adapter) |
155 : web_browser_(web_browser), | 155 : web_browser_(web_browser), |
156 chrome_frame_(chrome_frame), | 156 chrome_frame_(chrome_frame), |
157 adapter_(adapter), | 157 adapter_(adapter), |
158 weak_ptr_factory_(this) { | 158 weak_ptr_factory_(this) { |
159 } | 159 } |
160 | 160 |
161 void BrowserObserver::OnNavigateTo(const std::wstring& url) { | 161 void BrowserObserver::OnNavigateTo(const std::wstring& url) { |
162 if (!net::RegistryControlledDomainService:: | 162 if (!net::registry_controlled_domains::SameDomainOrHost( |
163 SameDomainOrHost(GURL(url), rendered_url_)) { | 163 GURL(url), |
| 164 rendered_url_, |
| 165 net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) { |
164 rendered_url_ = GURL(); | 166 rendered_url_ = GURL(); |
165 Hide(); | 167 Hide(); |
166 } | 168 } |
167 } | 169 } |
168 | 170 |
169 void BrowserObserver::OnRenderInChromeFrame(const std::wstring& url) { | 171 void BrowserObserver::OnRenderInChromeFrame(const std::wstring& url) { |
170 ShowPrompt(); | 172 ShowPrompt(); |
171 rendered_url_ = GURL(url); | 173 rendered_url_ = GURL(url); |
172 } | 174 } |
173 | 175 |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 } | 391 } |
390 } | 392 } |
391 | 393 |
392 // Depending on the state we finally end up in, tell our Delegate to disable | 394 // Depending on the state we finally end up in, tell our Delegate to disable |
393 // Chrome Frame functionality. | 395 // Chrome Frame functionality. |
394 if (ShouldDisableChromeFrame(status)) | 396 if (ShouldDisableChromeFrame(status)) |
395 delegate->DisableChromeFrame(); | 397 delegate->DisableChromeFrame(); |
396 } | 398 } |
397 | 399 |
398 } // namespace ready_mode | 400 } // namespace ready_mode |
OLD | NEW |