diff options
| author | reillyg <reillyg@chromium.org> | 2016-02-10 15:29:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 23:31:02 +0000 |
| commit | 64c8f4f25d9fbd2233e476d6276b4c63bcc4813c (patch) | |
| tree | 6b493ace49c49e995601c33d9ef14a94ccfe2f85 /device/devices_app/public/cpp | |
| parent | d1a4b660eb29113ef2a08f8544ebf1f2b212e6ec (diff) | |
| download | chromium_src-64c8f4f25d9fbd2233e476d6276b4c63bcc4813c.zip chromium_src-64c8f4f25d9fbd2233e476d6276b4c63bcc4813c.tar.gz chromium_src-64c8f4f25d9fbd2233e476d6276b4c63bcc4813c.tar.bz2 | |
Remove //device/devices_app.
This change removes the code to create a Mojo app containing device
services (currently only USB) and instead makes the Mojo bindings for
//device/usb part of that directory.
The Mojo service implementation is still in a separate //device/usb/mojo
target but this will eventually merge into its parent directory as the
Mojo interface becomes the only public interface for //device/usb.
BUG=None
Review URL: https://codereview.chromium.org/1682363002
Cr-Commit-Position: refs/heads/master@{#374778}
Diffstat (limited to 'device/devices_app/public/cpp')
| -rw-r--r-- | device/devices_app/public/cpp/BUILD.gn | 29 | ||||
| -rw-r--r-- | device/devices_app/public/cpp/constants.cc | 11 | ||||
| -rw-r--r-- | device/devices_app/public/cpp/constants.h | 14 | ||||
| -rw-r--r-- | device/devices_app/public/cpp/devices_app_factory.cc | 16 | ||||
| -rw-r--r-- | device/devices_app/public/cpp/devices_app_factory.h | 28 |
5 files changed, 0 insertions, 98 deletions
diff --git a/device/devices_app/public/cpp/BUILD.gn b/device/devices_app/public/cpp/BUILD.gn deleted file mode 100644 index 301d20f..0000000 --- a/device/devices_app/public/cpp/BUILD.gn +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("cpp") { - sources = [ - "constants.cc", - "constants.h", - ] - - public_deps = [ - "//base", - ] -} - -source_set("factory") { - sources = [ - "devices_app_factory.cc", - "devices_app_factory.h", - ] - - deps = [ - "//device/devices_app:lib", - ] - - public_deps = [ - "//base", - ] -} diff --git a/device/devices_app/public/cpp/constants.cc b/device/devices_app/public/cpp/constants.cc deleted file mode 100644 index 3bf4e01..0000000 --- a/device/devices_app/public/cpp/constants.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "device/devices_app/public/cpp/constants.h" - -namespace device { - -const char kDevicesMojoAppUrl[] = "mojo:devices"; - -} // namespace device diff --git a/device/devices_app/public/cpp/constants.h b/device/devices_app/public/cpp/constants.h deleted file mode 100644 index dfe242a..0000000 --- a/device/devices_app/public/cpp/constants.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef DEVICE_DEVICES_APP_PUBLIC_CPP_CONSTANTS_H_ -#define DEVICE_DEVICES_APP_PUBLIC_CPP_CONSTANTS_H_ - -namespace device { - -extern const char kDevicesMojoAppUrl[]; - -} // namespace device - -#endif // DEVICE_DEVICES_APP_PUBLIC_CPP_CONSTANTS_H_ diff --git a/device/devices_app/public/cpp/devices_app_factory.cc b/device/devices_app/public/cpp/devices_app_factory.cc deleted file mode 100644 index 154f67c..0000000 --- a/device/devices_app/public/cpp/devices_app_factory.cc +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "device/devices_app/public/cpp/devices_app_factory.h" - -#include "device/devices_app/devices_app.h" - -namespace device { - -// static -scoped_ptr<mojo::ShellClient> DevicesAppFactory::CreateApp() { - return scoped_ptr<mojo::ShellClient>(new DevicesApp()); -} - -} // namespace device diff --git a/device/devices_app/public/cpp/devices_app_factory.h b/device/devices_app/public/cpp/devices_app_factory.h deleted file mode 100644 index 6ba7447..0000000 --- a/device/devices_app/public/cpp/devices_app_factory.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef DEVICE_DEVICES_APP_PUBLIC_CPP_DEVICES_APP_FACTORY_H_ -#define DEVICE_DEVICES_APP_PUBLIC_CPP_DEVICES_APP_FACTORY_H_ - -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" - -namespace mojo { -class ShellClient; -} - -namespace device { - -// Public factory for creating new instances of the devices app. -class DevicesAppFactory { - public: - // Creates a DevicesApp delegate which can be used to launch a new instance - // of the devices app on a mojo application runner. The caller owns the - // delegate. - static scoped_ptr<mojo::ShellClient> CreateApp(); -}; - -} // namespace device - -#endif // DEVICE_DEVICES_APP_PUBLIC_CPP_DEVICES_APP_FACTORY_H_ |
