diff options
| author | slan <slan@chromium.org> | 2015-07-10 17:10:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-11 00:11:04 +0000 |
| commit | 0ffe2c1fe6c528e3e9ee88e2d394571705a9d35c (patch) | |
| tree | e5212bb13a109ce5f174c3f0eae238d493ac8567 /chromecast | |
| parent | 5c4eb6866ad14735e16e20b95f34fdea2863259c (diff) | |
| download | chromium_src-0ffe2c1fe6c528e3e9ee88e2d394571705a9d35c.zip chromium_src-0ffe2c1fe6c528e3e9ee88e2d394571705a9d35c.tar.gz chromium_src-0ffe2c1fe6c528e3e9ee88e2d394571705a9d35c.tar.bz2 | |
Revert "Fix key input."
This reverts commit 3a6a03bd2f7f796d03df95152723abfeee0061f2.
Note: Also removes now-stale dependency on "aura_test_support".
BUG=b/22410943
Review URL: https://codereview.chromium.org/1232213002
Cr-Commit-Position: refs/heads/master@{#338406}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/browser/cast_content_window.cc | 6 | ||||
| -rw-r--r-- | chromecast/browser/cast_content_window.h | 6 | ||||
| -rw-r--r-- | chromecast/chromecast.gyp | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/chromecast/browser/cast_content_window.cc b/chromecast/browser/cast_content_window.cc index 8ca0339..6afba6d 100644 --- a/chromecast/browser/cast_content_window.cc +++ b/chromecast/browser/cast_content_window.cc @@ -18,7 +18,6 @@ #include "chromecast/graphics/cast_screen.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/test/test_focus_client.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #endif @@ -92,11 +91,6 @@ void CastContentWindow::CreateWindowTree( } else { window_tree_host_->compositor()->SetBackgroundColor(SK_ColorBLACK); } - - focus_client_.reset(new aura::test::TestFocusClient()); - aura::client::SetFocusClient( - window_tree_host_->window(), focus_client_.get()); - window_tree_host_->Show(); // Add and show content's view/window diff --git a/chromecast/browser/cast_content_window.h b/chromecast/browser/cast_content_window.h index 9d76426..8160809 100644 --- a/chromecast/browser/cast_content_window.h +++ b/chromecast/browser/cast_content_window.h @@ -11,10 +11,7 @@ namespace aura { class WindowTreeHost; -namespace test { -class TestFocusClient; -} // namespace test -} // namespace aura +} namespace content { class BrowserContext; @@ -51,7 +48,6 @@ class CastContentWindow : public content::WebContentsObserver { private: #if defined(USE_AURA) scoped_ptr<aura::WindowTreeHost> window_tree_host_; - scoped_ptr<aura::test::TestFocusClient> focus_client_; #endif DISALLOW_COPY_AND_ASSIGN(CastContentWindow); diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp index 15372f4..df845ae 100644 --- a/chromecast/chromecast.gyp +++ b/chromecast/chromecast.gyp @@ -367,7 +367,6 @@ ], 'dependencies': [ '../components/components.gyp:metrics_serialization', - '../ui/aura/aura.gyp:aura_test_support', ], }], ['OS=="android"', { |