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

Unified Diff: components/html_viewer/html_frame_tree_manager.cc

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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_frame_tree_manager.h ('k') | components/html_viewer/html_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_frame_tree_manager.cc
diff --git a/components/html_viewer/html_frame_tree_manager.cc b/components/html_viewer/html_frame_tree_manager.cc
index 07d026ed5a075642d343c9feee625ccf077b8abe..84a6ab9fb2e22d63ae42ab38de07d7e93f51d1cf 100644
--- a/components/html_viewer/html_frame_tree_manager.cc
+++ b/components/html_viewer/html_frame_tree_manager.cc
@@ -68,7 +68,7 @@
// static
HTMLFrame* HTMLFrameTreeManager::CreateFrameAndAttachToTree(
GlobalState* global_state,
- mus::View* view,
+ mojo::View* view,
scoped_ptr<DocumentResourceWaiter> resource_waiter,
HTMLFrameDelegate* delegate) {
if (!instances_)
@@ -209,7 +209,7 @@
void HTMLFrameTreeManager::Init(
HTMLFrameDelegate* delegate,
- mus::View* local_view,
+ mojo::View* local_view,
const mojo::Array<web_view::FrameDataPtr>& frame_data,
uint32_t change_id) {
change_id_ = change_id;
@@ -223,7 +223,7 @@
HTMLFrameDelegate* delegate,
const mojo::Array<web_view::FrameDataPtr>& frame_data,
uint32_t local_frame_id,
- mus::View* local_view) {
+ mojo::View* local_view) {
std::vector<HTMLFrame*> parents;
HTMLFrame* root = nullptr;
HTMLFrame* last_frame = nullptr;
« no previous file with comments | « components/html_viewer/html_frame_tree_manager.h ('k') | components/html_viewer/html_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698