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

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: Rebase to master 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
« no previous file with comments | « chrome/browser/ui/tab_helpers.cc ('k') | chrome/browser/ui/webui/browsing_history_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 23 matching lines...) Expand all
34 #include "chrome/browser/permissions/chooser_context_base.h" 34 #include "chrome/browser/permissions/chooser_context_base.h"
35 #include "chrome/browser/permissions/permission_uma_util.h" 35 #include "chrome/browser/permissions/permission_uma_util.h"
36 #include "chrome/browser/permissions/permission_util.h" 36 #include "chrome/browser/permissions/permission_util.h"
37 #include "chrome/browser/profiles/profile.h" 37 #include "chrome/browser/profiles/profile.h"
38 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 38 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
39 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 39 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
40 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 40 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
41 #include "chrome/browser/usb/usb_chooser_context.h" 41 #include "chrome/browser/usb/usb_chooser_context.h"
42 #include "chrome/browser/usb/usb_chooser_context_factory.h" 42 #include "chrome/browser/usb/usb_chooser_context_factory.h"
43 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
44 #include "chrome/common/features.h"
45 #include "chrome/common/url_constants.h" 44 #include "chrome/common/url_constants.h"
46 #include "chrome/grit/chromium_strings.h" 45 #include "chrome/grit/chromium_strings.h"
47 #include "chrome/grit/generated_resources.h" 46 #include "chrome/grit/generated_resources.h"
48 #include "chrome/grit/theme_resources.h" 47 #include "chrome/grit/theme_resources.h"
49 #include "components/content_settings/core/browser/content_settings_utils.h" 48 #include "components/content_settings/core/browser/content_settings_utils.h"
50 #include "components/content_settings/core/browser/host_content_settings_map.h" 49 #include "components/content_settings/core/browser/host_content_settings_map.h"
51 #include "components/content_settings/core/common/content_settings.h" 50 #include "components/content_settings/core/common/content_settings.h"
52 #include "components/content_settings/core/common/content_settings_pattern.h" 51 #include "components/content_settings/core/common/content_settings_pattern.h"
53 #include "components/rappor/public/rappor_utils.h" 52 #include "components/rappor/public/rappor_utils.h"
54 #include "components/rappor/rappor_service_impl.h" 53 #include "components/rappor/rappor_service_impl.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 #if !defined(OS_ANDROID) && !defined(OS_IOS) 372 #if !defined(OS_ANDROID) && !defined(OS_IOS)
374 // On desktop, internal URLs aren't handled by this class. Instead, a 373 // On desktop, internal URLs aren't handled by this class. Instead, a
375 // custom and simpler popup is shown. 374 // custom and simpler popup is shown.
376 DCHECK(!url.SchemeIs(content::kChromeUIScheme) && 375 DCHECK(!url.SchemeIs(content::kChromeUIScheme) &&
377 !url.SchemeIs(content::kChromeDevToolsScheme) && 376 !url.SchemeIs(content::kChromeDevToolsScheme) &&
378 !url.SchemeIs(content::kViewSourceScheme) && 377 !url.SchemeIs(content::kViewSourceScheme) &&
379 !url.SchemeIs(content_settings::kExtensionScheme)); 378 !url.SchemeIs(content_settings::kExtensionScheme));
380 #endif 379 #endif
381 380
382 bool isChromeUINativeScheme = false; 381 bool isChromeUINativeScheme = false;
383 #if BUILDFLAG(ANDROID_JAVA_UI) 382 #if defined(OS_ANDROID)
384 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme); 383 isChromeUINativeScheme = url.SchemeIs(chrome::kChromeUINativeScheme);
385 #endif 384 #endif
386 385
387 security_level_ = security_info.security_level; 386 security_level_ = security_info.security_level;
388 387
389 if (url.SchemeIs(url::kAboutScheme)) { 388 if (url.SchemeIs(url::kAboutScheme)) {
390 // All about: URLs except about:blank are redirected. 389 // All about: URLs except about:blank are redirected.
391 DCHECK_EQ(url::kAboutBlankURL, url.spec()); 390 DCHECK_EQ(url::kAboutBlankURL, url.spec());
392 site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT; 391 site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT;
393 site_identity_details_ = 392 site_identity_details_ =
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 info.connection_status = site_connection_status_; 757 info.connection_status = site_connection_status_;
759 info.connection_status_description = 758 info.connection_status_description =
760 UTF16ToUTF8(site_connection_details_); 759 UTF16ToUTF8(site_connection_details_);
761 info.identity_status = site_identity_status_; 760 info.identity_status = site_identity_status_;
762 info.identity_status_description = 761 info.identity_status_description =
763 UTF16ToUTF8(site_identity_details_); 762 UTF16ToUTF8(site_identity_details_);
764 info.certificate = certificate_; 763 info.certificate = certificate_;
765 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 764 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
766 ui_->SetIdentityInfo(info); 765 ui_->SetIdentityInfo(info);
767 } 766 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_helpers.cc ('k') | chrome/browser/ui/webui/browsing_history_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698