Revert of X11: Use CopyFromParent colormap when possible

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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 "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 #include <X11/extensions/shape.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xregion.h>
@@ skipping 1358 matching lines @@
       enable_transparent_visuals = params.type == Widget::InitParams::TYPE_DRAG;
   }
 
   Visual* visual = CopyFromParent;
   int depth = CopyFromParent;
   Colormap colormap = CopyFromParent;
   ui::XVisualManager::GetInstance()->ChooseVisualForWindow(
       enable_transparent_visuals, &visual, &depth, &colormap,
       &use_argb_visual_);
 
-  if (colormap != CopyFromParent) {
-    attribute_mask |= CWColormap;
-    swa.colormap = colormap;
-  }
+  attribute_mask |= CWColormap;
+  swa.colormap = colormap;
 
   // x.org will BadMatch if we don't set a border when the depth isn't the
   // same as the parent depth.
   attribute_mask |= CWBorderPixel;
   swa.border_pixel = 0;
 
   bounds_in_pixels_ = ToPixelRect(params.bounds);
   bounds_in_pixels_.set_size(AdjustSize(bounds_in_pixels_.size()));
   xwindow_ = XCreateWindow(xdisplay_, x_root_window_, bounds_in_pixels_.x(),
                            bounds_in_pixels_.y(), bounds_in_pixels_.width(),
@@ skipping 949 matching lines @@
   if (linux_ui) {
     ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
     if (native_theme)
       return native_theme;
   }
 
   return ui::NativeThemeAura::instance();
 }
 
 }  // namespace views