Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4883)

Unified Diff: chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc

Issue 1354143005: Don't autostart Chromevox in tests when a braille display is connected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add include. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc
index e2413b6e4ededa13a5330ce7e877b2d6904f0156..e57108f0034cab27a83b58f018d2594aae30f8d0 100644
--- a/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc
+++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_stub.cc
@@ -6,29 +6,13 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
+#include "chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h"
#include "chrome/common/extensions/api/braille_display_private.h"
namespace extensions {
namespace api {
namespace braille_display_private {
-// Stub implementation of BrailleController for use when brlapi is not
-// enabled.
-class BrailleControllerImpl : public BrailleController {
- public:
- static BrailleControllerImpl* GetInstance();
- scoped_ptr<DisplayState> GetDisplayState() override;
- void WriteDots(const std::vector<char>& cells) override;
- void AddObserver(BrailleObserver* observer) override;
- void RemoveObserver(BrailleObserver* observer) override;
-
- private:
- BrailleControllerImpl();
- ~BrailleControllerImpl() override;
- friend struct base::DefaultSingletonTraits<BrailleControllerImpl>;
- DISALLOW_COPY_AND_ASSIGN(BrailleControllerImpl);
-};
-
BrailleController::BrailleController() {
}
@@ -37,33 +21,7 @@ BrailleController::~BrailleController() {
// static
BrailleController* BrailleController::GetInstance() {
- return BrailleControllerImpl::GetInstance();
-}
-
-BrailleControllerImpl::BrailleControllerImpl() {
-}
-
-BrailleControllerImpl::~BrailleControllerImpl() {
-}
-
-// static
-BrailleControllerImpl* BrailleControllerImpl::GetInstance() {
- return base::Singleton<
- BrailleControllerImpl,
- base::LeakySingletonTraits<BrailleControllerImpl>>::get();
-}
-
-scoped_ptr<DisplayState> BrailleControllerImpl::GetDisplayState() {
- return scoped_ptr<DisplayState>(new DisplayState()).Pass();
-}
-
-void BrailleControllerImpl::WriteDots(const std::vector<char>& cells) {
-}
-
-void BrailleControllerImpl::AddObserver(BrailleObserver* observer) {
-}
-
-void BrailleControllerImpl::RemoveObserver(BrailleObserver* observer) {
+ return StubBrailleController::GetInstance();
}
} // namespace braille_display_private

Powered by Google App Engine
This is Rietveld 408576698