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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2400673003: Remove SSLStatus::security_style member and content::SecurityStyle (Closed)
Patch Set: more curly braces Created 4 years, 2 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 #include "content/public/common/web_preferences.h" 120 #include "content/public/common/web_preferences.h"
121 #include "device/geolocation/geolocation_service_context.h" 121 #include "device/geolocation/geolocation_service_context.h"
122 #include "device/nfc/nfc.mojom.h" 122 #include "device/nfc/nfc.mojom.h"
123 #include "device/wake_lock/wake_lock_service_context.h" 123 #include "device/wake_lock/wake_lock_service_context.h"
124 #include "net/base/url_util.h" 124 #include "net/base/url_util.h"
125 #include "net/http/http_cache.h" 125 #include "net/http/http_cache.h"
126 #include "net/http/http_transaction_factory.h" 126 #include "net/http/http_transaction_factory.h"
127 #include "net/url_request/url_request_context.h" 127 #include "net/url_request/url_request_context.h"
128 #include "net/url_request/url_request_context_getter.h" 128 #include "net/url_request/url_request_context_getter.h"
129 #include "services/shell/public/cpp/interface_provider.h" 129 #include "services/shell/public/cpp/interface_provider.h"
130 #include "third_party/WebKit/public/platform/WebSecurityStyle.h"
130 #include "third_party/WebKit/public/web/WebSandboxFlags.h" 131 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
131 #include "third_party/skia/include/core/SkBitmap.h" 132 #include "third_party/skia/include/core/SkBitmap.h"
132 #include "ui/accessibility/ax_tree_combiner.h" 133 #include "ui/accessibility/ax_tree_combiner.h"
133 #include "ui/base/layout.h" 134 #include "ui/base/layout.h"
134 #include "ui/events/blink/web_input_event_traits.h" 135 #include "ui/events/blink/web_input_event_traits.h"
135 #include "ui/gl/gl_switches.h" 136 #include "ui/gl/gl_switches.h"
136 137
137 #if defined(OS_ANDROID) 138 #if defined(OS_ANDROID)
138 #include "content/browser/android/content_video_view.h" 139 #include "content/browser/android/content_video_view.h"
139 #include "content/browser/android/date_time_chooser_android.h" 140 #include "content/browser/android/date_time_chooser_android.h"
(...skipping 3755 matching lines...) Expand 10 before | Expand all | Expand 10 after
3895 DidChangeThemeColor(theme_color_)); 3896 DidChangeThemeColor(theme_color_));
3896 last_sent_theme_color_ = theme_color_; 3897 last_sent_theme_color_ = theme_color_;
3897 } 3898 }
3898 } 3899 }
3899 3900
3900 void WebContentsImpl::DidChangeVisibleSSLState() { 3901 void WebContentsImpl::DidChangeVisibleSSLState() {
3901 if (delegate_) { 3902 if (delegate_) {
3902 delegate_->VisibleSSLStateChanged(this); 3903 delegate_->VisibleSSLStateChanged(this);
3903 3904
3904 SecurityStyleExplanations security_style_explanations; 3905 SecurityStyleExplanations security_style_explanations;
3905 SecurityStyle security_style = 3906 blink::WebSecurityStyle security_style =
3906 delegate_->GetSecurityStyle(this, &security_style_explanations); 3907 delegate_->GetSecurityStyle(this, &security_style_explanations);
3907 FOR_EACH_OBSERVER( 3908 FOR_EACH_OBSERVER(
3908 WebContentsObserver, observers_, 3909 WebContentsObserver, observers_,
3909 SecurityStyleChanged(security_style, security_style_explanations)); 3910 SecurityStyleChanged(security_style, security_style_explanations));
3910 } 3911 }
3911 } 3912 }
3912 3913
3913 void WebContentsImpl::NotifyBeforeFormRepostWarningShow() { 3914 void WebContentsImpl::NotifyBeforeFormRepostWarningShow() {
3914 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3915 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3915 BeforeFormRepostWarningShow()); 3916 BeforeFormRepostWarningShow());
(...skipping 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after
5284 dialog_manager_ = dialog_manager; 5285 dialog_manager_ = dialog_manager;
5285 } 5286 }
5286 5287
5287 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { 5288 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
5288 auto it = binding_sets_.find(interface_name); 5289 auto it = binding_sets_.find(interface_name);
5289 if (it != binding_sets_.end()) 5290 if (it != binding_sets_.end())
5290 binding_sets_.erase(it); 5291 binding_sets_.erase(it);
5291 } 5292 }
5292 5293
5293 } // namespace content 5294 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_manager.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698