| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index 07347c516c17cf2924cfe0af97d3e81b0c7e7584..002ab8e61341427d1893f98f417cdbdafb1ad199 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -74,7 +74,6 @@
|
| #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
|
| #include "chrome/browser/ui/startup/startup_browser_creator.h"
|
| #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
|
| -#include "chrome/browser/ui/zoom/zoom_event_manager.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths_internal.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -105,6 +104,7 @@
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/common/content_constants.h"
|
| #include "content/public/common/page_zoom.h"
|
| +#include "extensions/browser/ui/zoom/zoom_event_manager.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -852,7 +852,7 @@ scoped_ptr<content::ZoomLevelDelegate>
|
| ProfileImpl::CreateZoomLevelDelegate(const base::FilePath& partition_path) {
|
| return make_scoped_ptr(new chrome::ChromeZoomLevelPrefs(
|
| GetPrefs(), GetPath(), partition_path,
|
| - ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
|
| + extensions::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()));
|
| }
|
|
|
| base::FilePath ProfileImpl::GetPath() const {
|
|
|