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

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

Issue 2510803003: Pass RapporService to content/browser/ (Closed)
Patch Set: Fix more compile errors in JNI files Created 4 years 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
44 #include "chrome/common/features.h" 44 #include "chrome/common/features.h"
45 #include "chrome/common/url_constants.h" 45 #include "chrome/common/url_constants.h"
46 #include "chrome/grit/chromium_strings.h" 46 #include "chrome/grit/chromium_strings.h"
47 #include "chrome/grit/generated_resources.h" 47 #include "chrome/grit/generated_resources.h"
48 #include "chrome/grit/theme_resources.h" 48 #include "chrome/grit/theme_resources.h"
49 #include "components/content_settings/core/browser/content_settings_utils.h" 49 #include "components/content_settings/core/browser/content_settings_utils.h"
50 #include "components/content_settings/core/browser/host_content_settings_map.h" 50 #include "components/content_settings/core/browser/host_content_settings_map.h"
51 #include "components/content_settings/core/common/content_settings.h" 51 #include "components/content_settings/core/common/content_settings.h"
52 #include "components/content_settings/core/common/content_settings_pattern.h" 52 #include "components/content_settings/core/common/content_settings_pattern.h"
53 #include "components/rappor/rappor_utils.h" 53 #include "components/rappor/public/rappor_utils.h"
54 #include "components/rappor/rappor_service_impl.h"
54 #include "components/ssl_errors/error_info.h" 55 #include "components/ssl_errors/error_info.h"
55 #include "components/strings/grit/components_chromium_strings.h" 56 #include "components/strings/grit/components_chromium_strings.h"
56 #include "components/strings/grit/components_strings.h" 57 #include "components/strings/grit/components_strings.h"
57 #include "components/url_formatter/elide_url.h" 58 #include "components/url_formatter/elide_url.h"
58 #include "content/public/browser/browser_thread.h" 59 #include "content/public/browser/browser_thread.h"
59 #include "content/public/browser/permission_type.h" 60 #include "content/public/browser/permission_type.h"
60 #include "content/public/browser/user_metrics.h" 61 #include "content/public/browser/user_metrics.h"
61 #include "content/public/common/content_switches.h" 62 #include "content/public/common/content_switches.h"
62 #include "content/public/common/url_constants.h" 63 #include "content/public/common/url_constants.h"
63 #include "net/cert/cert_status_flags.h" 64 #include "net/cert/cert_status_flags.h"
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 info.connection_status = site_connection_status_; 792 info.connection_status = site_connection_status_;
792 info.connection_status_description = 793 info.connection_status_description =
793 UTF16ToUTF8(site_connection_details_); 794 UTF16ToUTF8(site_connection_details_);
794 info.identity_status = site_identity_status_; 795 info.identity_status = site_identity_status_;
795 info.identity_status_description = 796 info.identity_status_description =
796 UTF16ToUTF8(site_identity_details_); 797 UTF16ToUTF8(site_identity_details_);
797 info.certificate = certificate_; 798 info.certificate = certificate_;
798 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 799 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
799 ui_->SetIdentityInfo(info); 800 ui_->SetIdentityInfo(info);
800 } 801 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698