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

Unified Diff: mojo/shell/desktop/mojo_main.cc

Issue 603273003: Prevent static mojo builds from pulling //ui/gl into mojo_shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address James' comments Created 6 years, 3 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 | « mojo/shell/BUILD.gn ('k') | ui/gl/gl_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/desktop/mojo_main.cc
diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc
index 3dac7c78abce1c662de280e647278b700347101c..5710cbb3243daccd2bb74a4233ca87c2104cad59 100644
--- a/mojo/shell/desktop/mojo_main.cc
+++ b/mojo/shell/desktop/mojo_main.cc
@@ -11,7 +11,6 @@
#include "mojo/shell/context.h"
#include "mojo/shell/init.h"
#include "mojo/shell/switches.h"
-#include "ui/gfx/switches.h"
#if defined(COMPONENT_BUILD)
#include "ui/gl/gl_surface.h"
@@ -19,6 +18,11 @@
namespace {
+#if defined(OS_LINUX)
+// Copied from ui/gfx/switches.cc to avoid a dependency on //ui/gfx
+const char kEnableHarfBuzzRenderText[] = "enable-harfbuzz-rendertext";
+#endif
+
void RunApps(mojo::shell::Context* context) {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
@@ -40,7 +44,7 @@ int main(int argc, char** argv) {
// backend (currently the default on linux) is not close to threadsafe. Force
// use of the harfbuzz backend for now.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kEnableHarfBuzzRenderText);
+ kEnableHarfBuzzRenderText);
#endif
mojo::shell::InitializeLogging();
« no previous file with comments | « mojo/shell/BUILD.gn ('k') | ui/gl/gl_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698