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

Unified Diff: components/html_viewer/html_document_oopif.cc

Issue 1246053003: Renames html_viewer frame classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor cleanup Created 5 years, 5 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 | « components/html_viewer/html_document_oopif.h ('k') | components/html_viewer/html_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_document_oopif.cc
diff --git a/components/html_viewer/html_document_oopif.cc b/components/html_viewer/html_document_oopif.cc
index 1dfc61b6f82f1a1f3b21c12b5f3f1a17b104bfea..88dc74103f67b4c4c115413a0016207fab4ed8c7 100644
--- a/components/html_viewer/html_document_oopif.cc
+++ b/components/html_viewer/html_document_oopif.cc
@@ -14,9 +14,9 @@
#include "components/html_viewer/blink_url_request_type_converters.h"
#include "components/html_viewer/devtools_agent_impl.h"
#include "components/html_viewer/document_resource_waiter.h"
-#include "components/html_viewer/frame.h"
-#include "components/html_viewer/frame_tree_manager.h"
#include "components/html_viewer/global_state.h"
+#include "components/html_viewer/html_frame.h"
+#include "components/html_viewer/html_frame_tree_manager.h"
#include "components/html_viewer/test_html_viewer_impl.h"
#include "components/html_viewer/web_url_loader_impl.h"
#include "components/view_manager/ids.h"
@@ -139,8 +139,8 @@ void HTMLDocumentOOPIF::Load() {
view->RemoveObserver(this);
frame_tree_manager_.reset(
- new FrameTreeManager(global_state_, html_document_app_, connection_,
- view->id(), frame_tree_server.Pass()));
+ new HTMLFrameTreeManager(global_state_, html_document_app_, connection_,
+ view->id(), frame_tree_server.Pass()));
frame_tree_manager_->set_delegate(this);
frame_tree_manager_binding_.reset(
new mojo::Binding<mandoline::FrameTreeClient>(
@@ -152,7 +152,7 @@ void HTMLDocumentOOPIF::Load() {
// cannot enable remote debugging (which is required by Telemetry tests) on
// the bots.
if (EnableRemoteDebugging()) {
- Frame* frame = frame_tree_manager_->GetLocalFrame();
+ HTMLFrame* frame = frame_tree_manager_->GetLocalFrame();
if (!frame->parent()) {
devtools_agent_.reset(new DevToolsAgentImpl(
frame->web_frame()->toWebLocalFrame(), html_document_app_->shell()));
@@ -208,7 +208,7 @@ bool HTMLDocumentOOPIF::ShouldNavigateLocallyInMainFrame() {
return devtools_agent_ && devtools_agent_->handling_page_navigate_request();
}
-void HTMLDocumentOOPIF::OnFrameDidFinishLoad(Frame* frame) {
+void HTMLDocumentOOPIF::OnFrameDidFinishLoad(HTMLFrame* frame) {
// TODO(msw): Notify AxProvider clients of updates on child frame loads.
if (frame_tree_manager_ &&
frame != frame_tree_manager_->GetLocalFrame()) {
« no previous file with comments | « components/html_viewer/html_document_oopif.h ('k') | components/html_viewer/html_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698