Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

chrome/browser/chromeos/login/helper.cc

 // Copyright (c) 2011 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/login/helper.h"
 
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/customization_document.h"
+#include "chrome/browser/chromeos/system_access.h"
 #include "chrome/browser/google/google_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/native_button.h"
@@ skipping 14 matching lines @@
 
 // Time in ms before smoothed throbber is shown.
 const int kThrobberStartDelayMs = 500;
 
 const SkColor kBackgroundCenterColor = SkColorSetRGB(41, 50, 67);
 const SkColor kBackgroundEdgeColor = SK_ColorBLACK;
 
 const char kAccountRecoveryHelpUrl[] =
     "https://www.google.com/support/accounts/bin/answer.py?answer=48598";
 
-// Path to OEM partner startup customization manifest.
-const char kStartupCustomizationManifestPath[] =
-    "/opt/oem/etc/startup_manifest.json";
-
 class BackgroundPainter : public views::Painter {
  public:
   BackgroundPainter() {}
 
   virtual void Paint(int w, int h, gfx::Canvas* canvas) {
     SkRect rect;
     rect.set(SkIntToScalar(0),
              SkIntToScalar(0),
              SkIntToScalar(w),
              SkIntToScalar(h));
@@ skipping 156 matching lines @@
     return l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
   } else if (network_library->wifi_connecting()) {
     return ASCIIToUTF16(network_library->wifi_network()->name());
   } else if (network_library->cellular_connecting()) {
     return ASCIIToUTF16(network_library->cellular_network()->name());
   } else {
     return string16();
   }
 }
 
-const chromeos::StartupCustomizationDocument* LoadStartupManifest() {
-  // Loading manifest causes us to do blocking IO on UI thread.
-  // Temporarily allow it until we fix http://crosbug.com/11103
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
-  FilePath startup_manifest_path(kStartupCustomizationManifestPath);
-  if (file_util::PathExists(startup_manifest_path)) {
-    scoped_ptr<chromeos::StartupCustomizationDocument> customization(
-        new chromeos::StartupCustomizationDocument());
-    bool manifest_loaded = customization->LoadManifestFromFile(
-        startup_manifest_path);
-    if (manifest_loaded) {
-      VLOG(1) << "Startup manifest loaded successfully";
-      return customization.release();
-    }
-    LOG(ERROR) << "Error loading startup manifest: "
-               << kStartupCustomizationManifestPath;
-  }
-
-  return NULL;
-}
-
 namespace login {
 
 gfx::Size WideButton::GetPreferredSize() {
   gfx::Size preferred_size = NativeButton::GetPreferredSize();
   // Set minimal width.
   if (preferred_size.width() < kButtonMinWidth)
     preferred_size.set_width(kButtonMinWidth);
   return preferred_size;
 }
 
 }  // namespace login
 
 }  // namespace chromeos