Skip to content
Permalink
Browse files

Fixed install unpacked

  • Loading branch information...
ivan2kh
ivan2kh committed Feb 12, 2017
1 parent eb76ee9 commit db4cd01f5e2d40ba8bf6589d0c9b7589216ddb9e
Showing with 4 additions and 2 deletions.
  1. +2 −2 chrome/browser/browser_process_impl.cc
  2. +2 −0 chrome/browser/prefs/browser_prefs.cc
@@ -249,9 +249,9 @@ BrowserProcessImpl::BrowserProcessImpl(

device_client_.reset(new ChromeDeviceClient);

#if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_ANDROID)
#if BUILDFLAG(ENABLE_EXTENSIONS)
// Athena sets its own instance during Athena's init process.
extensions::AppWindowClient::Set(ChromeAppWindowClient::GetInstance());
// extensions::AppWindowClient::Set(ChromeAppWindowClient::GetInstance());

extension_event_router_forwarder_ = new extensions::EventRouterForwarder;

@@ -574,10 +574,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
#if BUILDFLAG(ENABLE_APP_LIST)
DriveAppMapping::RegisterProfilePrefs(registry);
app_list::AppListSyncableService::RegisterProfilePrefs(registry);
#endif
#endif
extensions::CommandService::RegisterProfilePrefs(registry);
extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
#if !defined(OS_ANDROID)
first_run::RegisterProfilePrefs(registry);
NewTabUI::RegisterProfilePrefs(registry);
PepperFlashSettingsManager::RegisterProfilePrefs(registry);

0 comments on commit db4cd01

Please sign in to comment.
You can’t perform that action at this time.