Remove --load-2x-resources flag.

Remove --load-2x-resources flag.

BUG=140040
TEST=Running chrome with --force-device-scale-factor=2 still loads 2x resources.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=150648

[flackr, 2012-08-07 15:02:09]

This looks like a noop since we check device scale factor or load 2x resources
everywhere. Do we want to load 2x resources whether or not force device scale
factor is set? It seems http://codereview.chromium.org/10828052/ may be
preparing us for determining when we should try to load 2x resources, though
from the bug it sounds like we could just always check for the files.

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

http://codereview.chromium.org/10837142/diff/1/chrome/browser/chromeos/login/...
File chrome/browser/chromeos/login/helper.cc (left):

http://codereview.chromium.org/10837142/diff/1/chrome/browser/chromeos/login/...
chrome/browser/chromeos/login/helper.cc:114: if
(CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoad2xResources))
Aren't you losing functionality here?

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux.cc
File ui/aura/root_window_host_linux.cc (right):

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux...
ui/aura/root_window_host_linux.cc:306: return
gfx::Display::GetForcedDeviceScaleFactor() > 1.0f;
Remove this function

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux...
ui/aura/root_window_host_linux.cc:411: DCHECK(!HasLoaded2xResources() ||
scale_factor_ == image_rep.GetScale());
Remove this DCHECK

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux...
ui/aura/root_window_host_linux.cc:427: DCHECK(!HasLoaded2xResources() ||
scale_factor_ == image_rep.GetScale());
Remove this DCHECK as well

http://codereview.chromium.org/10837142/diff/1/ui/base/resource/resource_bund...
File ui/base/resource/resource_bundle_aurax11.cc (right):

http://codereview.chromium.org/10837142/diff/1/ui/base/resource/resource_bund...
ui/base/resource/resource_bundle_aurax11.cc:29: return
gfx::Display::GetForcedDeviceScaleFactor() > 1.0f;
As per off line discussion, this should always return true.

[flackr, 2012-08-07 18:05:41]

http://codereview.chromium.org/10837142/diff/1/chrome/browser/chromeos/login/...
File chrome/browser/chromeos/login/helper.cc (left):

http://codereview.chromium.org/10837142/diff/1/chrome/browser/chromeos/login/...
chrome/browser/chromeos/login/helper.cc:114: if
(CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoad2xResources))
On 2012/08/07 16:04:58, pkotwicz wrote:
> Aren't you losing functionality here?

Yes, I was presuming that we would use the above scale path but given we detect
the scale factor we'll have to use something like the maximum supported scale
factor (which for now I can perhaps always double until your patch lands).

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

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux.cc
File ui/aura/root_window_host_linux.cc (right):

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux...
ui/aura/root_window_host_linux.cc:306: return
gfx::Display::GetForcedDeviceScaleFactor() > 1.0f;
On 2012/08/07 16:04:58, pkotwicz wrote:
> Remove this function

Done.

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux...
ui/aura/root_window_host_linux.cc:411: DCHECK(!HasLoaded2xResources() ||
scale_factor_ == image_rep.GetScale());
On 2012/08/07 16:04:58, pkotwicz wrote:
> Remove this DCHECK

Done.

http://codereview.chromium.org/10837142/diff/1/ui/aura/root_window_host_linux...
ui/aura/root_window_host_linux.cc:427: DCHECK(!HasLoaded2xResources() ||
scale_factor_ == image_rep.GetScale());
On 2012/08/07 16:04:58, pkotwicz wrote:
> Remove this DCHECK as well

Done.

http://codereview.chromium.org/10837142/diff/1/ui/base/resource/resource_bund...
File ui/base/resource/resource_bundle_aurax11.cc (right):

http://codereview.chromium.org/10837142/diff/1/ui/base/resource/resource_bund...
ui/base/resource/resource_bundle_aurax11.cc:29: return
gfx::Display::GetForcedDeviceScaleFactor() > 1.0f;
On 2012/08/07 16:04:58, pkotwicz wrote:
> As per off line discussion, this should always return true.

Removed function.

[pkotwicz, 2012-08-07 20:52:19]

lgtm

[flackr, 2012-08-08 14:03:45]

Scott, can you take a look? Thanks!

[sky, 2012-08-08 14:45:02]

LGTM

[commit-bot: I haz the power, 2012-08-08 15:16:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/flackr@chromium.org/10837142/2002

[commit-bot: I haz the power, 2012-08-08 16:48:24]

Failed to apply patch for ui/base/resource/resource_bundle_aurax11.cc:
While running patch -p1 --forward --force;
patching file ui/base/resource/resource_bundle_aurax11.cc
Hunk #2 FAILED at 45.
Hunk #3 FAILED at 65.
2 out of 3 hunks FAILED -- saving rejects to file
ui/base/resource/resource_bundle_aurax11.cc.rej

[commit-bot: I haz the power, 2012-08-08 17:20:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/flackr@chromium.org/10837142/14001

[commit-bot: I haz the power, 2012-08-08 18:50:38]

Try job failure for 10837142-14001 (retry) on mac_rel for step "browser_tests".
It's a second try, previously, step "browser_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2012-08-08 20:28:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/flackr@chromium.org/10837142/14001

[commit-bot: I haz the power, 2012-08-09 00:25:45]

Change committed as 150648