| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index 0f6b4c03ac8d01b94d4e2719cbd01685b4b6c2a3..594f76f1ad8583b17305110e910d572b336c5134 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -66,6 +66,7 @@
|
| #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h"
|
| #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| +#include "chrome/browser/ui/color_chooser_controller.h"
|
| #include "chrome/browser/web_resource/promo_resource_service.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| @@ -625,6 +626,10 @@ BookmarkPromptController* BrowserProcessImpl::bookmark_prompt_controller() {
|
| #endif
|
| }
|
|
|
| +ColorChooserController* BrowserProcessImpl::color_chooser_controller() {
|
| + return color_chooser_controller_.get();
|
| +}
|
| +
|
| chrome::MediaFileSystemRegistry*
|
| BrowserProcessImpl::media_file_system_registry() {
|
| if (!media_file_system_registry_)
|
| @@ -908,6 +913,8 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
|
| }
|
| #endif
|
|
|
| + color_chooser_controller_.reset(new ColorChooserController());
|
| +
|
| #if defined(OS_MACOSX)
|
| app_shim_host_manager_.reset(new AppShimHostManager);
|
| #endif
|
|
|