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

Unified Diff: mandoline/ui/desktop_ui/browser_window.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 | « mandoline/ui/aura/window_tree_host_mojo.cc ('k') | mandoline/ui/desktop_ui/browser_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/desktop_ui/browser_window.h
diff --git a/mandoline/ui/desktop_ui/browser_window.h b/mandoline/ui/desktop_ui/browser_window.h
index 576e927540ea88415c459935d143aaf0b1f03ef3..c2ff8de53cc68c5be6f6cbb8778c46663eaec337 100644
--- a/mandoline/ui/desktop_ui/browser_window.h
+++ b/mandoline/ui/desktop_ui/browser_window.h
@@ -30,7 +30,7 @@
class ProgressView;
class ToolbarView;
-class BrowserWindow : public mus::ViewTreeDelegate,
+class BrowserWindow : public mojo::ViewTreeDelegate,
public mojo::ViewTreeHostClient,
public web_view::mojom::WebViewClient,
public ViewEmbedder,
@@ -53,9 +53,9 @@
float DIPSToPixels(float value) const;
- // Overridden from mus::ViewTreeDelegate:
- void OnEmbed(mus::View* root) override;
- void OnConnectionLost(mus::ViewTreeConnection* connection) override;
+ // Overridden from mojo::ViewTreeDelegate:
+ void OnEmbed(mojo::View* root) override;
+ void OnConnectionLost(mojo::ViewTreeConnection* connection) override;
// Overridden from ViewTreeHostClient:
void OnAccelerator(uint32_t id, mojo::EventPtr event) override;
@@ -80,7 +80,7 @@
gfx::Size GetPreferredSize(const views::View* view) const override;
void Layout(views::View* host) override;
- void Init(mus::View* root);
+ void Init(mojo::View* root);
void EmbedOmnibox();
mojo::ApplicationImpl* app_;
@@ -90,9 +90,9 @@
BrowserManager* manager_;
ToolbarView* toolbar_view_;
ProgressView* progress_bar_;
- mus::View* root_;
- mus::View* content_;
- mus::View* omnibox_view_;
+ mojo::View* root_;
+ mojo::View* content_;
+ mojo::View* omnibox_view_;
mojo::WeakBindingSet<ViewEmbedder> view_embedder_bindings_;
« no previous file with comments | « mandoline/ui/aura/window_tree_host_mojo.cc ('k') | mandoline/ui/desktop_ui/browser_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698