Resize images for hi-dpi based on a custom PNG chunk added by GRIT r78, and roll GRIT r78

chrome/browser/chromeos/chrome_browser_main_chromeos.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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 332 matching lines @@
     chromeos::SystemKeyEventListener::Initialize();
   }
 
   ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
 }
 
 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- immediately before Profile creation().
 
+  // In Aura builds this will initialize ash::Shell. Call it first so that
+  // the device scale factor is available when loading images.

[oshima, 2012/10/10 16:21:28]

// Call it first before performing UI related tasks. For 
// example, the device scale factor must be available before
// loading images.

Please correct Engrish as needed :)

[stevenjb, 2012/10/10 17:07:27]

How this initializes Ash is not entirely obvious, I would recommend:

// This will call ChromeBrowserMainParts::PreProfileInit(), which calls
ChromeBrowserMainExtraPartsAsh::PreProfileInit() which instantiates ash::Shell.
This needs to happen before performing any UI related tasks, e.g. the device
scale factor must be available before loading images.

+  ChromeBrowserMainPartsLinux::PreProfileInit();
+
   // Now that the file thread exists we can record our stats.
   chromeos::BootTimesLoader::Get()->RecordChromeMainStats();

[stevenjb, 2012/10/10 17:07:27]

This should probably still be first.

 
   // Trigger prefetching of ownership status.
   chromeos::DeviceSettingsService::Get()->Load();
 
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just before CreateProfile().
 
   // Initialize the screen locker now so that it can receive
   // LOGIN_USER_CHANGED notification from UserManager.
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     chromeos::KioskModeIdleLogout::Initialize();
   } else {
     chromeos::ScreenLocker::InitClass();
   }
 
   // This forces the ProfileManager to be created and register for the
   // notification it needs to track the logged in user.
   g_browser_process->profile_manager();

[stevenjb, 2012/10/10 17:07:27]

I assume this has been carefully tested? I'd worry that Ash::Shell
initialization may expect the profile manager to be instantiated. If I recall
correctly, it was added to the end of this function because of dependencies on
profile and/or login or session information.

 
   // TODO(abarth): Should this move to InitializeNetworkOptions()?
   // Allow access to file:// on ChromeOS for tests.
   if (parsed_command_line().HasSwitch(switches::kAllowFileAccess))
     ChromeNetworkDelegate::AllowAccessToAllFiles();
 
   if (parsed_command_line().HasSwitch(switches::kEnableContacts)) {
     contact_manager_.reset(new contacts::ContactManager());
     contact_manager_->Init();
   }
@@ skipping 15 matching lines @@
 
     // Initialize user policy before creating the profile so the profile
     // initialization code sees policy settings.
     // Guest accounts are not subject to user policy.
     if (!chromeos::UserManager::Get()->IsLoggedInAsGuest()) {
       g_browser_process->browser_policy_connector()->InitializeUserPolicy(
           username, false  /* wait_for_policy_fetch */);
     }
     chromeos::UserManager::Get()->SessionStarted();
   }
-
-  // In Aura builds this will initialize ash::Shell.
-  ChromeBrowserMainPartsLinux::PreProfileInit();
 }
 
 void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just after CreateProfile().
 
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
 
   if (parsed_command_line().HasSwitch(switches::kLoginUser) &&
@@ skipping 196 matching lines @@
       LOG(WARNING) << "low_mem: Part of '100MB' experiment";
       chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
     } else if (trial->group() == margin_200mb) {
       LOG(WARNING) << "low_mem: Part of '200MB' experiment";
       chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
     } else {
       LOG(WARNING) << "low_mem: Part of 'default' experiment";
     }
   }
 }