Refactor utility methods out of the ProfileManager

chrome/browser/ui/gtk/gtk_util.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/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <algorithm>
 #include <cstdarg>
 #include <map>
 
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profile_manager_util.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 108 matching lines @@
 // either the resource bundle or the profile info cache.
 GdkPixbuf* GetAvatarIcon(Profile* profile) {
   if (profile->IsOffTheRecord()) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     return rb.GetNativeImageNamed(IDR_OTR_ICON).ToGdkPixbuf();
   }
 
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
-  if (!ProfileManager::IsMultipleProfilesEnabled() ||
+  if (!profiles::IsMultipleProfilesEnabled() ||
       cache.GetNumberOfProfiles() < 2)
     return NULL;
 
   const size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
 
   return (index != std::string::npos ?
           cache.GetAvatarIconOfProfileAtIndex(index).ToGdkPixbuf() :
           static_cast<GdkPixbuf*>(NULL));
 }
 
@@ skipping 827 matching lines @@
   if (gtk_window_get_modal(GTK_WINDOW(dialog))) {
     // Work around a KDE 3 window manager bug.
     scoped_ptr<base::Environment> env(base::Environment::Create());
     if (base::nix::DESKTOP_ENVIRONMENT_KDE3 ==
         base::nix::GetDesktopEnvironment(env.get()))
       gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
   }
 }
 
 }  // namespace gtk_util