Makes MaterialDesignController initialization explicit

chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc

 // Copyright 2016 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/views/chrome_browser_main_extra_parts_views_linux.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 65 matching lines @@
   views::LinuxUI::SetInstance(gtk2_ui);
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
   ChromeBrowserMainExtraPartsViews::ToolkitInitialized();
   views::LinuxUI::instance()->Initialize();
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::PreCreateThreads() {
   ChromeBrowserMainExtraPartsViews::PreCreateThreads();
+  // TODO(varkha): The next call should not be necessary once Material Design is
+  // on unconditionally.
+  views::LinuxUI::instance()->MaterialDesignControllerReady();
   views::LinuxUI::instance()->UpdateDeviceScaleFactor(
       gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::PreProfileInit() {
   // On the Linux desktop, we want to prevent the user from logging in as root,
   // so that we don't destroy the profile. Now that we have some minimal ui
   // initialized, check to see if we're running as root and bail if we are.
   if (getuid() != 0)
     return;
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kUserDataDir))
     return;
 
   base::string16 title = l10n_util::GetStringFUTF16(
       IDS_REFUSE_TO_RUN_AS_ROOT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   base::string16 message = l10n_util::GetStringFUTF16(
       IDS_REFUSE_TO_RUN_AS_ROOT_2, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 
   chrome::ShowWarningMessageBox(NULL, title, message);
 
   // Avoids gpu_process_transport_factory.cc(153)] Check failed:
   // per_compositor_data_.empty() when quit is chosen.
   base::RunLoop().RunUntilIdle();
 
   exit(EXIT_FAILURE);
 }