Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0

chrome/browser/ui/browser_view_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_view_prefs.h"
 
 #include "build/build_config.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_registry_simple.h"
@@ skipping 14 matching lines @@
 
 namespace chrome {
 
 void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* registry) {
   registry->RegisterIntegerPref(kTabStripLayoutType, 0);
   registry->RegisterBooleanPref(prefs::kTabStripStackedLayout, false);
 }
 
 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::GetCustomFramePrefDefault (from ui/base/x/x11_util.cc
| h) is only built for use_x11 or wayland_platform_x11 builds.

Ideally, there should be a ui/base/ozone/ozone_util.cc implementing this
function, but for this bring-up, I decided to simple ifdef it out. Maybe a TODO
would be enough for now?

Note that CHROMEOS builds, even when running with ozone/x11, do not run this
method.

   registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
                                 ui::GetCustomFramePrefDefault());
 #endif
 
   registry->RegisterIntegerPref(
       prefs::kBackShortcutBubbleShownCount, 0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 void MigrateBrowserTabStripPrefs(PrefService* prefs) {
   if (prefs->HasPrefPath(kTabStripLayoutType)) {
     prefs->SetBoolean(prefs::kTabStripStackedLayout,
                       prefs->GetInteger(kTabStripLayoutType) != 0);
     prefs->ClearPref(kTabStripLayoutType);
   }
 }
 
 }  // namespace chrome