| Index: ui/gfx/image/image_skia.cc
|
| diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
|
| index b37cb7abbeeb2b857e544568b7c96601b2153289..21d08de30037bc1f0af1d9a0dd25fc927c3cbe72 100644
|
| --- a/ui/gfx/image/image_skia.cc
|
| +++ b/ui/gfx/image/image_skia.cc
|
| @@ -319,13 +319,8 @@ ImageSkia ImageSkia::CreateFrom1xBitmap(const SkBitmap& bitmap) {
|
|
|
| bool ImageSkia::IsDSFScalingInImageSkiaEnabled() {
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| -#if defined(OS_WIN)
|
| return !command_line->HasSwitch(
|
| - switches::kDisallowArbitraryScaleFactorInImageSkia);
|
| -#else
|
| - return command_line->HasSwitch(
|
| - switches::kAllowArbitraryScaleFactorInImageSkia);
|
| -#endif
|
| + switches::kDisableArbitraryScaleFactorInImageSkia);
|
| }
|
|
|
| scoped_ptr<ImageSkia> ImageSkia::DeepCopy() const {
|
|
|