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

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

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Created 3 years, 11 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 (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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 #if !defined(OS_ANDROID) && !defined(OS_IOS) 373 #if !defined(OS_ANDROID) && !defined(OS_IOS)
374 // On desktop, internal URLs aren't handled by this class. Instead, a 374 // On desktop, internal URLs aren't handled by this class. Instead, a
375 // custom and simpler popup is shown. 375 // custom and simpler popup is shown.
376 DCHECK(!url.SchemeIs(content::kChromeUIScheme) && 376 DCHECK(!url.SchemeIs(content::kChromeUIScheme) &&
377 !url.SchemeIs(content::kChromeDevToolsScheme) && 377 !url.SchemeIs(content::kChromeDevToolsScheme) &&
378 !url.SchemeIs(content::kViewSourceScheme) && 378 !url.SchemeIs(content::kViewSourceScheme) &&
379 !url.SchemeIs(content_settings::kExtensionScheme)); 379 !url.SchemeIs(content_settings::kExtensionScheme));
380 #endif 380 #endif
381 381
382 bool isChromeUINativeScheme = false; 382 bool isChromeUINativeScheme = false;
383 #if BUILDFLAG(ANDROID_JAVA_UI) 383 #if defined(OS_ANDROID)
384 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme); 384 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);
385 #endif 385 #endif
386 386
387 security_level_ = security_info.security_level; 387 security_level_ = security_info.security_level;
388 388
389 if (url.SchemeIs(url::kAboutScheme)) { 389 if (url.SchemeIs(url::kAboutScheme)) {
390 // All about: URLs except about:blank are redirected. 390 // All about: URLs except about:blank are redirected.
391 DCHECK_EQ(url::kAboutBlankURL, url.spec()); 391 DCHECK_EQ(url::kAboutBlankURL, url.spec());
392 site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT; 392 site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT;
393 site_identity_details_ = 393 site_identity_details_ =
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 info.connection_status = site_connection_status_; 758 info.connection_status = site_connection_status_;
759 info.connection_status_description = 759 info.connection_status_description =
760 UTF16ToUTF8(site_connection_details_); 760 UTF16ToUTF8(site_connection_details_);
761 info.identity_status = site_identity_status_; 761 info.identity_status = site_identity_status_;
762 info.identity_status_description = 762 info.identity_status_description =
763 UTF16ToUTF8(site_identity_details_); 763 UTF16ToUTF8(site_identity_details_);
764 info.certificate = certificate_; 764 info.certificate = certificate_;
765 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 765 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
766 ui_->SetIdentityInfo(info); 766 ui_->SetIdentityInfo(info);
767 } 767 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698