Remove --load-2x-resources flag.

ui/aura/root_window_host_linux.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/aura/root_window_host_linux.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xcursor/Xcursor.h>
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
@@ skipping 285 matching lines @@
     case ui::VKEY_OEM_COMMA:
     case ui::VKEY_OEM_MINUS:
     case ui::VKEY_OEM_PERIOD:
       return true;
     default:
       return false;
   }
 }
 
 bool HasLoaded2xResources() {
-  return gfx::Display::GetForcedDeviceScaleFactor() > 1.0f ||
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoad2xResources);
+  return gfx::Display::GetForcedDeviceScaleFactor() > 1.0f;

[pkotwicz, 2012/08/07 16:04:58]

Remove this function

[flackr, 2012/08/07 18:47:50]

Done.

 }
 
 }  // namespace
 
 // A utility class that provides X Cursor for NativeCursors for which we have
 // image resources.
 class RootWindowHostLinux::ImageCursors {
  public:
   ImageCursors() : scale_factor_(0.0) {
   }
@@ skipping 84 matching lines @@
     return cursors_[type];
   }
 
  private:
   // Creates an X Cursor from an image resource and puts it in the cursor map.
   void LoadImageCursor(int id, int resource_id, int hot_x, int hot_y) {
     const gfx::ImageSkia* image =
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
     const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(
         ui::GetScaleFactorFromScale(scale_factor_));
     DCHECK(!HasLoaded2xResources() || scale_factor_ == image_rep.GetScale());

[pkotwicz, 2012/08/07 16:04:58]

Remove this DCHECK

[flackr, 2012/08/07 18:47:50]

Done.

     gfx::Point hot(hot_x * scale_factor_, hot_y * scale_factor_);
     XcursorImage* x_image =
         ui::SkBitmapToXcursorImage(&image_rep.sk_bitmap(), hot);
     cursors_[id] = ui::CreateReffedCustomXCursor(x_image);
     // |bitmap| is owned by the resource bundle. So we do not need to free it.
   }
 
   // Creates an animated X Cursor from an image resource and puts it in the
   // cursor map. The image is assumed to be a concatenation of animation frames.
   // Also, each frame is assumed to be square (width == height)
   void LoadAnimatedCursor(int id, int resource_id, int hot_x, int hot_y) {
     const gfx::ImageSkia* image =
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
     const gfx::ImageSkiaRep& image_rep = image->GetRepresentation(
         ui::GetScaleFactorFromScale(scale_factor_));
     DCHECK(!HasLoaded2xResources() || scale_factor_ == image_rep.GetScale());

[pkotwicz, 2012/08/07 16:04:58]

Remove this DCHECK as well

[flackr, 2012/08/07 18:47:50]

Done.

     const SkBitmap bitmap = image_rep.sk_bitmap();
     DCHECK_EQ(bitmap.config(), SkBitmap::kARGB_8888_Config);
     int frame_width = bitmap.height();
     int frame_height = frame_width;
     int total_width = bitmap.width();
     DCHECK_EQ(total_width % frame_width, 0);
     int frame_count = total_width / frame_width;
     DCHECK_GT(frame_count, 0);
     XcursorImages* x_images = XcursorImagesCreate(frame_count);
     x_images->nimage = frame_count;
@@ skipping 622 matching lines @@
       ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey));
 }
 
 // static
 gfx::Size RootWindowHost::GetNativeScreenSize() {
   ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay();
   return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
 }
 
 }  // namespace aura