diff options
author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 15:29:50 +0000 |
---|---|---|
committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 15:29:50 +0000 |
commit | eaef2a3f543f50bdd913d0a3fbe45f270639b9cf (patch) | |
tree | cef812ee43113dc874aaaf0e1d24074da9c6649e /ui/aura | |
parent | 0f5c8c8def9e8d1af6e76dee819df4be8d30f4e6 (diff) | |
download | chromium_src-eaef2a3f543f50bdd913d0a3fbe45f270639b9cf.zip chromium_src-eaef2a3f543f50bdd913d0a3fbe45f270639b9cf.tar.gz chromium_src-eaef2a3f543f50bdd913d0a3fbe45f270639b9cf.tar.bz2 |
Revert 120566 - Implements accelerator handling for menus on aura.
BUG=105964
TEST=Manual
Depends on http://codereview.chromium.org/9124021
Review URL: https://chromiumcodereview.appspot.com/9224001
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9310124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
-rw-r--r-- | ui/aura/aura.gyp | 2 | ||||
-rw-r--r-- | ui/aura/client/dispatcher_client.cc | 31 | ||||
-rw-r--r-- | ui/aura/client/dispatcher_client.h | 29 |
3 files changed, 0 insertions, 62 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index 8c4bc99..c84a74e 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -32,8 +32,6 @@ 'client/activation_delegate.h', 'client/aura_constants.cc', 'client/aura_constants.h', - 'client/dispatcher_client.cc', - 'client/dispatcher_client.h', 'client/drag_drop_client.cc', 'client/drag_drop_client.h', 'client/drag_drop_delegate.cc', diff --git a/ui/aura/client/dispatcher_client.cc b/ui/aura/client/dispatcher_client.cc deleted file mode 100644 index f9cd3ac..0000000 --- a/ui/aura/client/dispatcher_client.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2012 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 "ui/aura/client/dispatcher_client.h" - -#include "ui/aura/root_window.h" - -namespace aura { - -namespace client { - -namespace { - -// A property key to store the nested dispatcher controller. The type of the -// value is |aura::client::DispatcherClient*|. -const char kDispatcherClient[] = "AuraDispatcherClient"; - -} // namespace - -void SetDispatcherClient(DispatcherClient* client) { - RootWindow::GetInstance()->SetProperty(kDispatcherClient, client); -} - -DispatcherClient* GetDispatcherClient() { - return reinterpret_cast<DispatcherClient*>( - RootWindow::GetInstance()->GetProperty(kDispatcherClient)); -} - -} // namespace client -} // namespace aura diff --git a/ui/aura/client/dispatcher_client.h b/ui/aura/client/dispatcher_client.h deleted file mode 100644 index 099e370..0000000 --- a/ui/aura/client/dispatcher_client.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2012 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 UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ -#define UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ -#pragma once - -#include "ui/aura/aura_export.h" -#include "base/message_loop.h" - -namespace aura { - -namespace client { - -// An interface implemented by an object which handles nested dispatchers. -class AURA_EXPORT DispatcherClient { - public: - virtual void RunWithDispatcher(MessageLoop::Dispatcher* dispatcher, - bool nestable_tasks_allowed) = 0; -}; - -AURA_EXPORT void SetDispatcherClient(DispatcherClient* client); -AURA_EXPORT DispatcherClient* GetDispatcherClient(); - -} // namespace client -} // namespace aura - -#endif // UI_AURA_CLIENT_DISPATCHER_CLIENT_H_ |