| commit | 4a90e5862e0c43d9501af87c326bce9414ab4fde | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Wed May 30 18:14:37 2012 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Wed May 30 18:14:37 2012 |
| tree | f5e056dbcbff5add371001ee2d510ac9790908db | |
| parent | c2dc12c370b4dd009172986db7c3796849987bf5 [diff] [blame] |
browser: Handle the registration of ChromeLauncher prefs outside of views. BUG=125846 [email protected] [email protected] Review URL: https://chromiumcodereview.appspot.com/10445043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139577 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 70acc53..9305a5ee 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc
@@ -103,7 +103,7 @@ #endif #if defined(USE_ASH) -#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" +#include "chrome/browser/ui/ash/chrome_launcher_prefs.h" #endif namespace browser { @@ -216,7 +216,7 @@ #endif #if defined(USE_ASH) - ChromeLauncherController::RegisterUserPrefs(user_prefs); + ash::RegisterChromeLauncherUserPrefs(user_prefs); #endif #if !defined(OS_ANDROID)