| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 1eaac21f40a0bdca21676c4b5e4072d3960bb133..0babd72bd8f15412f384e5a7aa372e19eb33ae46 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -62,8 +62,8 @@
|
| #include "chrome/browser/net/chrome_net_log.h"
|
| #include "chrome/browser/net/predictor.h"
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| -#include "chrome/browser/page_cycler/page_cycler.h"
|
| #include "chrome/browser/notifications/desktop_notification_service_factory.h"
|
| +#include "chrome/browser/page_cycler/page_cycler.h"
|
| #include "chrome/browser/plugin_prefs.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/prefs/pref_value_store.h"
|
| @@ -387,7 +387,7 @@ Profile* CreateProfile(const content::MainFunctionParams& parameters,
|
| // prompt the user to pick a different user-data-dir and restart chrome
|
| // with the new dir.
|
| // http://code.google.com/p/chromium/issues/detail?id=11510
|
| - FilePath new_user_data_dir = browser::ShowUserDataDirDialog(user_data_dir);
|
| + FilePath new_user_data_dir = chrome::ShowUserDataDirDialog(user_data_dir);
|
|
|
| if (!new_user_data_dir.empty()) {
|
| // Because of the way CommandLine parses, it's sufficient to append a new
|
|
|