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

Unified Diff: chrome/browser/ui/browser_view_prefs.cc

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: reverted changes in base/ime/ Created 4 years, 2 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
Index: chrome/browser/ui/browser_view_prefs.cc
diff --git a/chrome/browser/ui/browser_view_prefs.cc b/chrome/browser/ui/browser_view_prefs.cc
index 1bf1eb74b2a0b8088abd6e609a39de9e131b9f1d..272ffc24dad7ad5fbc1daa85b65320bb3025abfb 100644
--- a/chrome/browser/ui/browser_view_prefs.cc
+++ b/chrome/browser/ui/browser_view_prefs.cc
@@ -32,7 +32,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) {
void RegisterBrowserViewProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
Tom (Use chromium acct) 2016/10/17 23:40:52 why is this needed?
tonikitoo 2016/10/18 04:55:06 This is needed because ui::GetCustomFramePrefDefau
registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
ui::GetCustomFramePrefDefault());
#endif

Powered by Google App Engine
This is Rietveld 408576698