Enable browser plugin compositing by default, but add a flag to disable it.

chrome/browser/chromeos/login/chrome_restart_request.cc

 // Copyright 2013 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/chromeos/login/chrome_restart_request.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "base/chromeos/chromeos_version.h"
@@ skipping 54 matching lines @@
                               CommandLine* command_line) {
   DCHECK_NE(&base_command_line, command_line);
 
   static const char* kForwardSwitches[] = {
       ::switches::kAllowWebUICompositing,
       ::switches::kDeviceManagementUrl,
       ::switches::kDisableAccelerated2dCanvas,
       ::switches::kDisableAcceleratedOverflowScroll,
       ::switches::kDisableAcceleratedPlugins,
       ::switches::kDisableAcceleratedVideoDecode,
+      ::switches::kDisableBrowserPluginCompositing,
       ::switches::kDisableEncryptedMedia,
       ::switches::kDisableForceCompositingMode,
       ::switches::kDisableGpuWatchdog,
       ::switches::kDisableLoginAnimations,
       ::switches::kDisableNonuniformGpuMemPolicy,
       ::switches::kDisableOobeAnimation,
       ::switches::kDisablePanelFitting,
       ::switches::kDisableThreadedCompositing,
       ::switches::kDisableSeccompFilterSandbox,
       ::switches::kDisableSeccompSandbox,
       ::switches::kEnableAcceleratedOverflowScroll,
-      ::switches::kEnableBrowserPluginCompositing,
       ::switches::kEnableCompositingForFixedPosition,
       ::switches::kEnableGestureTapHighlight,
       ::switches::kEnableLogging,
       ::switches::kEnablePinch,
       ::switches::kEnableViewport,
       ::switches::kForceDeviceScaleFactor,
       ::switches::kGpuStartupDialog,
       ::switches::kHasChromeOSDiamondKey,
       ::switches::kHasChromeOSKeyboard,
       ::switches::kLoginProfile,
@@ skipping 180 matching lines @@
                            base_command_line,
                            otr_switches,
                            command_line);
 }
 
 std::string GetKioskAppCommandLine(const std::string& app_id) {
   base::DictionaryValue app_switches;
   app_switches.SetString(::switches::kForceAppMode, std::string());
   app_switches.SetString(::switches::kAppId, app_id);
   app_switches.SetString(::switches::kLoginUser, std::string());
-  // TODO(zelidrag): Move the next switch to /sbin/session_manager_setup.sh
-  // instead once http://crbug.com/179256 is resolved.
-  app_switches.SetString(::switches::kEnableBrowserPluginCompositing,
-                         std::string());
 
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   CommandLine new_command_line(browser_command_line.GetProgram());
   return DeriveCommandLine(GURL(),
                            browser_command_line,
                            app_switches,
                            &new_command_line);
 }
 
 void RestartChrome(const std::string& command_line) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   static bool restart_requested = false;
   if (restart_requested) {
     NOTREACHED() << "Request chrome restart for more than once.";
   }
   restart_requested = true;
 
   if (!base::chromeos::IsRunningOnChromeOS()) {
     // Relaunch chrome without session manager on dev box.
     ReLaunch(command_line);
     return;
   }
 
   // ChromeRestartRequest deletes itself after request sent to session manager.
   (new ChromeRestartRequest(command_line))->Start();
 }
 
 }  // namespace chromeos