Chromium Code Reviews

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

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
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/browser/ui/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 295 matching lines...)
306 DCHECK(chrome_ssl_host_state_delegate_); 306 DCHECK(chrome_ssl_host_state_delegate_);
307 chrome_ssl_host_state_delegate_->RevokeUserAllowExceptionsHard( 307 chrome_ssl_host_state_delegate_->RevokeUserAllowExceptionsHard(
308 site_url().host()); 308 site_url().host());
309 did_revoke_user_ssl_decisions_ = true; 309 did_revoke_user_ssl_decisions_ = true;
310 } 310 }
311 311
312 void WebsiteSettings::Init( 312 void WebsiteSettings::Init(
313 const GURL& url, 313 const GURL& url,
314 const SecurityStateModel::SecurityInfo& security_info) { 314 const SecurityStateModel::SecurityInfo& security_info) {
315 bool isChromeUINativeScheme = false; 315 bool isChromeUINativeScheme = false;
316 #if defined(OS_ANDROID) 316 #if defined(ANDROID_JAVA_UI)
317 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme); 317 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);
318 #endif 318 #endif
319 319
320 if (url.SchemeIs(url::kAboutScheme)) { 320 if (url.SchemeIs(url::kAboutScheme)) {
321 // All about: URLs except about:blank are redirected. 321 // All about: URLs except about:blank are redirected.
322 DCHECK_EQ(url::kAboutBlankURL, url.spec()); 322 DCHECK_EQ(url::kAboutBlankURL, url.spec());
323 site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT; 323 site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT;
324 site_identity_details_ = 324 site_identity_details_ =
325 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY); 325 l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY);
326 site_connection_status_ = SITE_CONNECTION_STATUS_UNENCRYPTED; 326 site_connection_status_ = SITE_CONNECTION_STATUS_UNENCRYPTED;
(...skipping 372 matching lines...)
699 info.connection_status = site_connection_status_; 699 info.connection_status = site_connection_status_;
700 info.connection_status_description = 700 info.connection_status_description =
701 UTF16ToUTF8(site_connection_details_); 701 UTF16ToUTF8(site_connection_details_);
702 info.identity_status = site_identity_status_; 702 info.identity_status = site_identity_status_;
703 info.identity_status_description = 703 info.identity_status_description =
704 UTF16ToUTF8(site_identity_details_); 704 UTF16ToUTF8(site_identity_details_);
705 info.cert_id = cert_id_; 705 info.cert_id = cert_id_;
706 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 706 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
707 ui_->SetIdentityInfo(info); 707 ui_->SetIdentityInfo(info);
708 } 708 }
OLDNEW

Powered by Google App Engine