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

Unified Diff: components/html_viewer/html_frame.h

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_document.cc ('k') | components/html_viewer/html_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_frame.h
diff --git a/components/html_viewer/html_frame.h b/components/html_viewer/html_frame.h
index 2b8c070747362ad5e3bb58c4498ce1dbe140a1a4..826299e646da78f419ccd22580c03ba6c6cdccc9 100644
--- a/components/html_viewer/html_frame.h
+++ b/components/html_viewer/html_frame.h
@@ -33,9 +33,6 @@
namespace mojo {
class ApplicationImpl;
class Rect;
-}
-
-namespace mus {
class ScopedViewPtr;
class View;
}
@@ -53,7 +50,7 @@
// Frame is used to represent a single frame in the frame tree of a page. The
// frame is either local or remote. Each Frame is associated with a single
// HTMLFrameTreeManager and can not be moved to another HTMLFrameTreeManager.
-// Local frames have a mus::View, remote frames do not.
+// Local frames have a mojo::View, remote frames do not.
//
// HTMLFrame serves as the FrameTreeClient. It implements it by forwarding
// the calls to HTMLFrameTreeManager so that HTMLFrameTreeManager can update
@@ -68,14 +65,14 @@
class HTMLFrame : public blink::WebFrameClient,
public blink::WebRemoteFrameClient,
public web_view::FrameTreeClient,
- public mus::ViewObserver {
+ public mojo::ViewObserver {
public:
struct CreateParams {
CreateParams(
HTMLFrameTreeManager* manager,
HTMLFrame* parent,
uint32_t id,
- mus::View* view,
+ mojo::View* view,
const mojo::Map<mojo::String, mojo::Array<uint8_t>>& properties,
HTMLFrameDelegate* delegate)
: manager(manager),
@@ -90,7 +87,7 @@
HTMLFrameTreeManager* manager;
HTMLFrame* parent;
uint32_t id;
- mus::View* view;
+ mojo::View* view;
const mojo::Map<mojo::String, mojo::Array<uint8_t>>& properties;
HTMLFrameDelegate* delegate;
@@ -128,10 +125,10 @@
blink::WebView* web_view();
blink::WebWidget* GetWebWidget();
- // The mus::View this frame renders to. This is non-null for the local frame
+ // The mojo::View this frame renders to. This is non-null for the local frame
// the frame tree was created with as well as non-null for any frames created
// locally.
- mus::View* view() { return view_; }
+ mojo::View* view() { return view_; }
HTMLFrameTreeManager* frame_tree_manager() { return frame_tree_manager_; }
@@ -213,7 +210,7 @@
// Gets the FrameTreeServer to use for this frame.
web_view::FrameTreeServer* GetFrameTreeServer();
- void SetView(mus::View* view);
+ void SetView(mojo::View* view);
// Creates the appropriate WebWidget implementation for the Frame.
void CreateRootWebWidget();
@@ -228,7 +225,7 @@
// Swaps this frame from a remote frame to a local frame.
void SwapToLocal(
HTMLFrameDelegate* delegate,
- mus::View* view,
+ mojo::View* view,
const mojo::Map<mojo::String, mojo::Array<uint8_t>>& properties);
// Invoked when changing the delegate. This informs the new delegate to take
@@ -244,14 +241,14 @@
// The various frameDetached() implementations call into this.
void FrameDetachedImpl(blink::WebFrame* web_frame);
- // mus::ViewObserver methods:
- void OnViewBoundsChanged(mus::View* view,
+ // mojo::ViewObserver methods:
+ void OnViewBoundsChanged(mojo::View* view,
const mojo::Rect& old_bounds,
const mojo::Rect& new_bounds) override;
- void OnViewDestroyed(mus::View* view) override;
- void OnViewInputEvent(mus::View* view, const mojo::EventPtr& event) override;
- void OnViewFocusChanged(mus::View* gained_focus,
- mus::View* lost_focus) override;
+ void OnViewDestroyed(mojo::View* view) override;
+ void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override;
+ void OnViewFocusChanged(mojo::View* gained_focus,
+ mojo::View* lost_focus) override;
// web_view::FrameTreeClient:
void OnConnect(web_view::FrameTreeServerPtr server,
@@ -289,7 +286,7 @@
HTMLFrame* parent_;
// |view_| is non-null for local frames or remote frames that were once
// local.
- mus::View* view_;
+ mojo::View* view_;
// The id for this frame. If there is a view, this is the same id as the
// view has.
const uint32_t id_;
@@ -318,7 +315,7 @@
// as long as the frame is valid). If the View was deleted as soon as the
// frame was swapped to remote then the process rendering to the view would
// be severed.
- scoped_ptr<mus::ScopedViewPtr> owned_view_;
+ scoped_ptr<mojo::ScopedViewPtr> owned_view_;
// This object is only valid in the context of performance tests.
tracing::StartupPerformanceDataCollectorPtr
« no previous file with comments | « components/html_viewer/html_document.cc ('k') | components/html_viewer/html_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698