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

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

Issue 875183002: Make it possible to pass a default url to sky_debugger (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | sky/tools/debugger/debugger.cc » ('j') | 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 "base/memory/weak_ptr.h" 5 #include "base/memory/weak_ptr.h"
6 #include "mojo/public/cpp/application/application_delegate.h" 6 #include "mojo/public/cpp/application/application_delegate.h"
7 #include "mojo/public/cpp/application/application_impl.h" 7 #include "mojo/public/cpp/application/application_impl.h"
8 #include "mojo/public/cpp/application/connect.h" 8 #include "mojo/public/cpp/application/connect.h"
9 #include "mojo/public/cpp/application/service_provider_impl.h" 9 #include "mojo/public/cpp/application/service_provider_impl.h"
10 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h" 10 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 void Create(mojo::ApplicationConnection* connection, 62 void Create(mojo::ApplicationConnection* connection,
63 mojo::InterfaceRequest<Debugger> request) override; 63 mojo::InterfaceRequest<Debugger> request) override;
64 64
65 // Overridden from WindowManagerDelegate 65 // Overridden from WindowManagerDelegate
66 void Embed(const mojo::String& url, 66 void Embed(const mojo::String& url,
67 mojo::InterfaceRequest<mojo::ServiceProvider> services, 67 mojo::InterfaceRequest<mojo::ServiceProvider> services,
68 mojo::ServiceProviderPtr exposed_services) override; 68 mojo::ServiceProviderPtr exposed_services) override;
69 69
70 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; 70 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
71 71
72 // TODO(eseidel): This is per-embedding state and should be separate
73 // from the ApplicationDelegate!
72 mojo::View* root_; 74 mojo::View* root_;
73 mojo::View* content_; 75 mojo::View* content_;
76 std::string default_url_;
74 std::string pending_url_; 77 std::string pending_url_;
75 78
76 mojo::ServiceProviderPtr viewer_services_; 79 mojo::ServiceProviderPtr viewer_services_;
77 80
78 NavigatorHostFactory navigator_host_factory_; 81 NavigatorHostFactory navigator_host_factory_;
79 mojo::ServiceProviderImpl exposed_services_impl_; 82 mojo::ServiceProviderImpl exposed_services_impl_;
80 83
81 base::WeakPtrFactory<SkyDebugger> weak_factory_; 84 base::WeakPtrFactory<SkyDebugger> weak_factory_;
82 85
83 DISALLOW_COPY_AND_ASSIGN(SkyDebugger); 86 DISALLOW_COPY_AND_ASSIGN(SkyDebugger);
84 }; 87 };
85 88
86 } // namespace debugger 89 } // namespace debugger
87 } // namespace sky 90 } // namespace sky
OLDNEW
« no previous file with comments | « no previous file | sky/tools/debugger/debugger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698