diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 20:26:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 20:26:46 +0000 |
| commit | 48dea153e61257611ed56ccf0b2d8402e647b1ea (patch) | |
| tree | fed248e1210c9e6816d8c10c6fa4705fc74d1a86 /ui/aura/bench | |
| parent | c67b8a0ff961757fd9d390757e4c27f7a0536890 (diff) | |
| download | chromium_src-48dea153e61257611ed56ccf0b2d8402e647b1ea.zip chromium_src-48dea153e61257611ed56ccf0b2d8402e647b1ea.tar.gz chromium_src-48dea153e61257611ed56ccf0b2d8402e647b1ea.tar.bz2 | |
Move aura shared and desktop classes to the views target. Note that the files don't actually move, that'll come later. I'm just moving them from one target to another.
http://crbug.com/158115
R=scottmg@chromium.org
TBR=jam@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165719
Review URL: https://codereview.chromium.org/11368010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/bench')
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index f105854..c15ece4 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -12,11 +12,11 @@ #include "base/time.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/skia/include/core/SkXfermode.h" +#include "ui/aura/client/default_capture_client.h" #include "ui/aura/env.h" #include "ui/aura/focus_manager.h" #include "ui/aura/root_window.h" #include "ui/aura/single_display_manager.h" -#include "ui/aura/shared/root_window_capture_client.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" @@ -304,7 +304,7 @@ int main(int argc, char** argv) { aura::DisplayManager::CreateRootWindowForPrimaryDisplay()); aura::client::SetCaptureClient( root_window.get(), - new aura::shared::RootWindowCaptureClient(root_window.get())); + new aura::client::DefaultCaptureClient(root_window.get())); scoped_ptr<aura::FocusManager> focus_manager(new aura::FocusManager); root_window->set_focus_manager(focus_manager.get()); |