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

Unified Diff: components/html_viewer/setup.h

Issue 1165013005: Changes html_viewer to get services from appropriate application (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment on OnTerminate Created 5 years, 6 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_viewer.cc ('k') | mojo/application/public/cpp/application_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/setup.h
diff --git a/components/html_viewer/setup.h b/components/html_viewer/setup.h
index 07e54d386ba31e02d090c01600c68fcff9ae9b37..ed3255466d44c201d36613397c20890d48c851c1 100644
--- a/components/html_viewer/setup.h
+++ b/components/html_viewer/setup.h
@@ -49,7 +49,6 @@ class Setup {
void InitIfNecessary(const gfx::Size& screen_size_in_pixels,
float device_pixel_ratio);
- mojo::ApplicationImpl* app() const { return app_; }
bool is_headless() const { return is_headless_; }
bool did_init() const { return did_init_; }
@@ -66,6 +65,9 @@ class Setup {
MediaFactory* media_factory() { return media_factory_.get(); }
private:
+ // App for HTMLViewer, not the document's app.
+ // WARNING: do not expose this. It's too easy to use the wrong one.
+ // HTMLDocument should be using the application it creates, not this one.
mojo::ApplicationImpl* app_;
resource_provider::ResourceLoader resource_loader_;
« no previous file with comments | « components/html_viewer/html_viewer.cc ('k') | mojo/application/public/cpp/application_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698