Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Merge M-45: Stablize 'usb_printers' extension manifest key.
Browse files Browse the repository at this point in the history
The new permissions flow for USB printers feature is trying to launch in
M-45 and I forgot to stablize this before the branch point.

BUG=484546
[email protected],[email protected]

Review URL: https://codereview.chromium.org/1269083004

Cr-Commit-Position: refs/heads/master@{#341628}
(cherry-picked from commit 28fd987)

Review URL: https://codereview.chromium.org/1265353002 .

Cr-Commit-Position: refs/branch-heads/2454@{#227}
Cr-Branched-From: 12bfc33-refs/heads/master@{#338390}
  • Loading branch information
reillyeon committed Aug 4, 2015
1 parent 72d49df commit 30b1422
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "chrome/browser/extensions/test_extension_environment.h"
#include "chrome/browser/local_discovery/pwg_raster_converter.h"
#include "chrome/browser/ui/webui/print_preview/extension_printer_handler.h"
#include "chrome/common/extensions/features/feature_channel.h"
#include "chrome/test/base/testing_profile.h"
#include "device/core/device_client.h"
#include "device/usb/mock_usb_device.h"
Expand Down Expand Up @@ -553,8 +552,6 @@ TEST_F(ExtensionPrinterHandlerTest, GetPrinters_Reset) {
}

TEST_F(ExtensionPrinterHandlerTest, GetUsbPrinters) {
extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_DEV);

scoped_refptr<MockUsbDevice> device0 =
new MockUsbDevice(0, 0, "Google", "USB Printer", "");
usb_service_.AddDevice(device0);
Expand Down
2 changes: 1 addition & 1 deletion extensions/common/api/_manifest_features.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
"extension_types": ["platform_app"]
},
"usb_printers": {
"channel": "dev",
"channel": "stable",
"extension_types": ["platform_app"]
},
"version": {
Expand Down

0 comments on commit 30b1422

Please sign in to comment.