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

Side by Side Diff: sky/tools/debugger/debugger.cc

Issue 845103004: Mojo JS Bindings: add show_image example (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « sky/tools/debugger/debugger.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sky/tools/debugger/debugger.h" 5 #include "sky/tools/debugger/debugger.h"
6 6
7 #include "services/window_manager/basic_focus_rules.h" 7 #include "services/window_manager/basic_focus_rules.h"
8 8
9 namespace sky { 9 namespace sky {
10 namespace debugger { 10 namespace debugger {
11 11
12 SkyDebugger::SkyDebugger() 12 SkyDebugger::SkyDebugger()
13 : window_manager_app_(new window_manager::WindowManagerApp(this, nullptr)), 13 : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
14 root_(nullptr), 14 root_(nullptr),
15 content_(nullptr), 15 content_(nullptr),
16 navigator_host_factory_(this), 16 navigator_host_factory_(this),
17 weak_factory_(this) { 17 weak_factory_(this) {
18 } 18 }
19 19
20 SkyDebugger::~SkyDebugger() { 20 SkyDebugger::~SkyDebugger() {
21 } 21 }
22 22
23 base::WeakPtr<SkyDebugger> SkyDebugger::GetWeakPtr() { 23 base::WeakPtr<SkyDebugger> SkyDebugger::GetWeakPtr() {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 root_->AddChild(content_); 57 root_->AddChild(content_);
58 content_->SetVisible(true); 58 content_->SetVisible(true);
59 59
60 window_manager_app_->InitFocus( 60 window_manager_app_->InitFocus(
61 make_scoped_ptr(new window_manager::BasicFocusRules(root_))); 61 make_scoped_ptr(new window_manager::BasicFocusRules(root_)));
62 62
63 if (!pending_url_.empty()) 63 if (!pending_url_.empty())
64 NavigateToURL(pending_url_); 64 NavigateToURL(pending_url_);
65 } 65 }
66 66
67 void SkyDebugger::Embed(
68 const mojo::String& url,
69 mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) {
70 scoped_ptr<mojo::ServiceProviderImpl> exported_services(
71 new mojo::ServiceProviderImpl());
72 // exported_services->AddService(TBD) -- no exported services for now.
73 content_->Embed(url, exported_services.Pass());
74 }
75
67 void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) { 76 void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
68 root_ = nullptr; 77 root_ = nullptr;
69 } 78 }
70 79
71 void SkyDebugger::OnViewDestroyed(mojo::View* view) { 80 void SkyDebugger::OnViewDestroyed(mojo::View* view) {
72 view->RemoveObserver(this); 81 view->RemoveObserver(this);
73 } 82 }
74 83
75 void SkyDebugger::OnViewBoundsChanged(mojo::View* view, 84 void SkyDebugger::OnViewBoundsChanged(mojo::View* view,
76 const mojo::Rect& old_bounds, 85 const mojo::Rect& old_bounds,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 120 }
112 121
113 void SkyDebugger::InjectInspector() { 122 void SkyDebugger::InjectInspector() {
114 InspectorServicePtr inspector_service; 123 InspectorServicePtr inspector_service;
115 mojo::ConnectToService(viewer_services_.get(), &inspector_service); 124 mojo::ConnectToService(viewer_services_.get(), &inspector_service);
116 inspector_service->Inject(); 125 inspector_service->Inject();
117 } 126 }
118 127
119 } // namespace debugger 128 } // namespace debugger
120 } // namespace sky 129 } // namespace sky
OLDNEW
« no previous file with comments | « sky/tools/debugger/debugger.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698