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

Unified Diff: extensions/renderer/content_watcher.cc

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | extensions/renderer/extension_frame_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/content_watcher.cc
diff --git a/extensions/renderer/content_watcher.cc b/extensions/renderer/content_watcher.cc
index 95c8a57ef836562be42dbfb79b29496dcb451679..8c99e11364c9f0d8a16994d99bb73a529979bd62 100644
--- a/extensions/renderer/content_watcher.cc
+++ b/extensions/renderer/content_watcher.cc
@@ -89,10 +89,10 @@ void ContentWatcher::DidMatchCSS(
void ContentWatcher::NotifyBrowserOfChange(
blink::WebLocalFrame* changed_frame) const {
blink::WebFrame* const top_frame = changed_frame->top();
- const blink::WebSecurityOrigin top_origin = top_frame->securityOrigin();
+ const blink::WebSecurityOrigin top_origin = top_frame->getSecurityOrigin();
// Want to aggregate matched selectors from all frames where an
// extension with access to top_origin could run on the frame.
- if (!top_origin.canAccess(changed_frame->document().securityOrigin())) {
+ if (!top_origin.canAccess(changed_frame->document().getSecurityOrigin())) {
// If the changed frame can't be accessed by the top frame, then
// no change in it could affect the set of selectors we'd send back.
return;
@@ -101,7 +101,7 @@ void ContentWatcher::NotifyBrowserOfChange(
std::set<base::StringPiece> transitive_selectors;
for (blink::WebFrame* frame = top_frame; frame;
frame = frame->traverseNext(/*wrap=*/false)) {
- if (top_origin.canAccess(frame->securityOrigin())) {
+ if (top_origin.canAccess(frame->getSecurityOrigin())) {
std::map<blink::WebFrame*, std::set<std::string> >::const_iterator
frame_selectors = matching_selectors_.find(frame);
if (frame_selectors != matching_selectors_.end()) {
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | extensions/renderer/extension_frame_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698