s/FrameTreeNodeID/FrameTreeNodeId/
Change "ID" to "Id" to conform with Chromium's coding style.
As discussed at https://groups.google.com/a/chromium.org/d/msg/site-isolation-dev/NsYJyqLXPjQ/7FEPeewRAAAJ
Review URL: https://codereview.chromium.org/1513233002
Cr-Commit-Position: refs/heads/master@{#364392}
diff --git a/content/browser/download/download_request_handle.cc b/content/browser/download/download_request_handle.cc
index 6e319d3..89d6d00a 100644
--- a/content/browser/download/download_request_handle.cc
+++ b/content/browser/download/download_request_handle.cc
@@ -42,7 +42,7 @@
}
WebContents* DownloadRequestHandle::GetWebContents() const {
- // PlzNavigate: if a FrameTreeNodeID was provided, use it to return the
+ // PlzNavigate: if a FrameTreeNodeId was provided, use it to return the
// WebContents.
// TODO(davidben): This logic should be abstracted within the ResourceLoader
// stack. https://crbug.com/376003
@@ -64,7 +64,7 @@
}
DownloadManager* DownloadRequestHandle::GetDownloadManager() const {
- // PlzNavigate: if a FrameTreeNodeID was provided, use it to return the
+ // PlzNavigate: if a FrameTreeNodeId was provided, use it to return the
// DownloadManager.
// TODO(davidben): This logic should be abstracted within the ResourceLoader
// stack. https://crbug.com/376003
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index 8270ea29..3e711dd7 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -25,9 +25,9 @@
// This is a global map between frame_tree_node_ids and pointers to
// FrameTreeNodes.
-typedef base::hash_map<int, FrameTreeNode*> FrameTreeNodeIDMap;
+typedef base::hash_map<int, FrameTreeNode*> FrameTreeNodeIdMap;
-base::LazyInstance<FrameTreeNodeIDMap> g_frame_tree_node_id_map =
+base::LazyInstance<FrameTreeNodeIdMap> g_frame_tree_node_id_map =
LAZY_INSTANCE_INITIALIZER;
// These values indicate the loading progress status. The minimum progress
@@ -62,8 +62,8 @@
// static
FrameTreeNode* FrameTreeNode::GloballyFindByID(int frame_tree_node_id) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- FrameTreeNodeIDMap* nodes = g_frame_tree_node_id_map.Pointer();
- FrameTreeNodeIDMap::iterator it = nodes->find(frame_tree_node_id);
+ FrameTreeNodeIdMap* nodes = g_frame_tree_node_id_map.Pointer();
+ FrameTreeNodeIdMap::iterator it = nodes->find(frame_tree_node_id);
return it == nodes->end() ? nullptr : it->second;
}
@@ -96,7 +96,7 @@
effective_sandbox_flags_(sandbox_flags),
frame_owner_properties_(frame_owner_properties),
loading_progress_(kLoadingProgressNotStarted) {
- std::pair<FrameTreeNodeIDMap::iterator, bool> result =
+ std::pair<FrameTreeNodeIdMap::iterator, bool> result =
g_frame_tree_node_id_map.Get().insert(
std::make_pair(frame_tree_node_id_, this));
CHECK(result.second);
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 96d6c1f..87c139c 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -314,7 +314,7 @@
}
bool RenderFrameHostManager::ForInnerDelegate() {
- return delegate_->GetOuterDelegateFrameTreeNodeID() !=
+ return delegate_->GetOuterDelegateFrameTreeNodeId() !=
FrameTreeNode::kFrameTreeNodeInvalidID;
}
@@ -325,7 +325,7 @@
FrameTreeNode* outer_contents_frame_tree_node =
FrameTreeNode::GloballyFindByID(
- delegate_->GetOuterDelegateFrameTreeNodeID());
+ delegate_->GetOuterDelegateFrameTreeNodeId());
return outer_contents_frame_tree_node->parent()
->current_frame_host()
->render_view_host()
@@ -334,7 +334,7 @@
FrameTreeNode* RenderFrameHostManager::GetOuterDelegateNode() {
int outer_contents_frame_tree_node_id =
- delegate_->GetOuterDelegateFrameTreeNodeID();
+ delegate_->GetOuterDelegateFrameTreeNodeId();
return FrameTreeNode::GloballyFindByID(outer_contents_frame_tree_node_id);
}
@@ -351,7 +351,7 @@
RenderFrameProxyHost* RenderFrameHostManager::GetProxyToOuterDelegate() {
int outer_contents_frame_tree_node_id =
- delegate_->GetOuterDelegateFrameTreeNodeID();
+ delegate_->GetOuterDelegateFrameTreeNodeId();
FrameTreeNode* outer_contents_frame_tree_node =
FrameTreeNode::GloballyFindByID(outer_contents_frame_tree_node_id);
if (!outer_contents_frame_tree_node ||
@@ -367,7 +367,7 @@
void RenderFrameHostManager::RemoveOuterDelegateFrame() {
FrameTreeNode* outer_delegate_frame_tree_node =
FrameTreeNode::GloballyFindByID(
- delegate_->GetOuterDelegateFrameTreeNodeID());
+ delegate_->GetOuterDelegateFrameTreeNodeId());
DCHECK(outer_delegate_frame_tree_node->parent());
outer_delegate_frame_tree_node->frame_tree()->RemoveFrame(
outer_delegate_frame_tree_node);
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 2c6e5d4..9690fe4 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -168,7 +168,7 @@
// FrameTreeNode ID of the frame in the outer WebContents which hosts
// the inner WebContents. Returns FrameTreeNode::kFrameTreeNodeInvalidID
// if the delegate does not have an outer WebContents.
- virtual int GetOuterDelegateFrameTreeNodeID() = 0;
+ virtual int GetOuterDelegateFrameTreeNodeId() = 0;
protected:
virtual ~Delegate() {}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 1ca34e2..3ff2c4d3 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4618,7 +4618,7 @@
return capturer_count_ == 0 && !should_normally_be_visible_;
}
-int WebContentsImpl::GetOuterDelegateFrameTreeNodeID() {
+int WebContentsImpl::GetOuterDelegateFrameTreeNodeId() {
if (node_ && node_->outer_web_contents())
return node_->outer_contents_frame_tree_node_id();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index a46f717..7136cc8 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -643,7 +643,7 @@
bool FocusLocationBarByDefault() override;
void SetFocusToLocationBar(bool select_all) override;
bool IsHidden() override;
- int GetOuterDelegateFrameTreeNodeID() override;
+ int GetOuterDelegateFrameTreeNodeId() override;
// NotificationObserver ------------------------------------------------------
