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

Unified Diff: components/html_viewer/setup.cc

Issue 1166123005: Removes ServiceProviders from ViewManager::Embed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use is_headless rather than check for browser. 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/setup.h ('k') | components/view_manager/connection_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/setup.cc
diff --git a/components/html_viewer/setup.cc b/components/html_viewer/setup.cc
index 76a66148044c9f7acbe0eb54c49cd1b65ce030ca..1b65b1d822034c99d305e9c78be248e3f87a6dd5 100644
--- a/components/html_viewer/setup.cc
+++ b/components/html_viewer/setup.cc
@@ -75,7 +75,7 @@ Setup::Setup(mojo::ApplicationImpl* app)
discardable_memory_allocator_(kDesiredMaxMemory),
compositor_thread_("compositor thread") {
if (is_headless_)
- InitHeadless();
+ InitIfNecessary(gfx::Size(1024, 1024), 1.f);
}
Setup::~Setup() {
@@ -85,12 +85,6 @@ Setup::~Setup() {
}
}
-void Setup::InitHeadless() {
- DCHECK(!did_init_);
- is_headless_ = true;
- InitIfNecessary(gfx::Size(1024, 1024), 1.f);
-}
-
void Setup::InitIfNecessary(const gfx::Size& screen_size_in_pixels,
float device_pixel_ratio) {
if (did_init_)
« no previous file with comments | « components/html_viewer/setup.h ('k') | components/view_manager/connection_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698