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

Unified Diff: sky/tools/debugger/debugger.cc

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format Created 6 years 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 | « sky/tools/debugger/debugger.h ('k') | sky/tools/tester/tester.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/debugger/debugger.cc
diff --git a/sky/tools/debugger/debugger.cc b/sky/tools/debugger/debugger.cc
index de931978cfacec8ad2b07a2b28ad90f41859ff42..2a19cbbd6d381d6b2ec4cbbf621601a2f2174fca 100644
--- a/sky/tools/debugger/debugger.cc
+++ b/sky/tools/debugger/debugger.cc
@@ -11,7 +11,6 @@ namespace debugger {
SkyDebugger::SkyDebugger()
: window_manager_app_(new window_manager::WindowManagerApp(this, nullptr)),
- view_manager_(nullptr),
root_(nullptr),
content_(nullptr),
navigator_host_factory_(this),
@@ -45,18 +44,15 @@ bool SkyDebugger::ConfigureOutgoingConnection(
}
void SkyDebugger::OnEmbed(
- mojo::ViewManager* view_manager,
mojo::View* root,
mojo::ServiceProviderImpl* exported_services,
scoped_ptr<mojo::ServiceProvider> imported_services) {
- view_manager_ = view_manager;
-
root_ = root;
root_->AddObserver(this);
window_manager_app_->SetViewportSize(gfx::Size(320, 640));
- content_ = mojo::View::Create(view_manager_);
+ content_ = mojo::View::Create(root->view_manager());
content_->SetBounds(root_->bounds());
root_->AddChild(content_);
content_->SetVisible(true);
@@ -69,7 +65,6 @@ void SkyDebugger::OnEmbed(
}
void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
- view_manager_ = nullptr;
root_ = nullptr;
}
« no previous file with comments | « sky/tools/debugger/debugger.h ('k') | sky/tools/tester/tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698