diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 00:24:56 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 00:24:56 +0000 |
| commit | 2d3beaff4d9d18969cd03dc1ed6fe06ce31f5029 (patch) | |
| tree | 8679ba36631e5c2a90dfab4bc7d3de3159851831 | |
| parent | 7c545b4cab63b4c5f499904b027a3bdf9611c3ec (diff) | |
| download | chromium_src-2d3beaff4d9d18969cd03dc1ed6fe06ce31f5029.zip chromium_src-2d3beaff4d9d18969cd03dc1ed6fe06ce31f5029.tar.gz chromium_src-2d3beaff4d9d18969cd03dc1ed6fe06ce31f5029.tar.bz2 | |
Merge 182257
> Revert 182127, reenabled on trunk.
> > Disabled help page than shown when USB printer connected.
> >
> > Need time to address privacy issues.
> >
> > BUG=175941
> > TBR=keybuk
> >
> > Review URL: https://codereview.chromium.org/12251017
>
> TBR=vitalybuka@chromium.org
TBR=vitalybuka@chromium.org
BUG=176145
Review URL: https://codereview.chromium.org/12324026
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@183674 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/dbus/cros_dbus_service.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/chrome/browser/chromeos/dbus/cros_dbus_service.cc index f7fac3f..a6f8b63 100644 --- a/chrome/browser/chromeos/dbus/cros_dbus_service.cc +++ b/chrome/browser/chromeos/dbus/cros_dbus_service.cc @@ -112,8 +112,7 @@ void CrosDBusService::Initialize() { CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus); service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create()); service->RegisterServiceProvider(new LivenessServiceProvider); - // TODO(vitalybuka): Re-enable after addressing privacy issues. - // service->RegisterServiceProvider(new PrinterServiceProvider); + service->RegisterServiceProvider(new PrinterServiceProvider); g_cros_dbus_service = service; service->Start(); } else { |