diff options
author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 06:34:39 +0000 |
---|---|---|
committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 06:34:39 +0000 |
commit | 08bfdd6d84eba3f87af54ab14a761d0000f76da5 (patch) | |
tree | ad2d6f0183c166024a2ff9a1103398a57b13ddd0 /ui/aura/client | |
parent | d4e3ef5735ce3e2f3119936278fa19cc9fb360af (diff) | |
download | chromium_src-08bfdd6d84eba3f87af54ab14a761d0000f76da5.zip chromium_src-08bfdd6d84eba3f87af54ab14a761d0000f76da5.tar.gz chromium_src-08bfdd6d84eba3f87af54ab14a761d0000f76da5.tar.bz2 |
Revert 112399 - Aura: Tooltip refactor. This Cl does the following:
* Add tooltip functionality to aura_shell that can be access through aura client API
* Provide an implementation of views::TooltipManager for aura (TooltipManagerAura) that views can use to display/update tooltips in aura
* Remove the no longer needed TooltipManagerViews.
BUG=97249
TEST=none
Review URL: http://codereview.chromium.org/8747022
TBR=varunjain@chromium.org
Review URL: http://codereview.chromium.org/8758020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/client')
-rw-r--r-- | ui/aura/client/aura_constants.cc | 1 | ||||
-rw-r--r-- | ui/aura/client/aura_constants.h | 4 | ||||
-rw-r--r-- | ui/aura/client/tooltip_client.h | 32 |
3 files changed, 0 insertions, 37 deletions
diff --git a/ui/aura/client/aura_constants.cc b/ui/aura/client/aura_constants.cc index e23b7a0..f0a651a 100644 --- a/ui/aura/client/aura_constants.cc +++ b/ui/aura/client/aura_constants.cc @@ -14,6 +14,5 @@ const char kModalKey[] = "Modal"; const char kShadowTypeKey[] = "ShadowType"; const char kDesktopDragDropClientKey[] = "DesktopDragDropClient"; const char kDragDropDelegateKey[] = "DragDropDelegate"; -const char kDesktopTooltipClientKey[] = "DesktopTooltipClient"; } // namespace aura diff --git a/ui/aura/client/aura_constants.h b/ui/aura/client/aura_constants.h index dbc321d..363c420 100644 --- a/ui/aura/client/aura_constants.h +++ b/ui/aura/client/aura_constants.h @@ -40,10 +40,6 @@ AURA_EXPORT extern const char kDesktopDragDropClientKey[]; // A property key to store the drag and drop delegate for a window. The type of // the value is |aura::WindowDragDropDelegate*|. AURA_EXPORT extern const char kDragDropDelegateKey[]; - -// A property key to store the tooltip client for the desktop. The type of -// the value is |aura::TooltipClient*|. -AURA_EXPORT extern const char kDesktopTooltipClientKey[]; } // namespace aura #endif // UI_AURA_CLIENT_AURA_CONSTANTS_H_ diff --git a/ui/aura/client/tooltip_client.h b/ui/aura/client/tooltip_client.h deleted file mode 100644 index eb6db2c..0000000 --- a/ui/aura/client/tooltip_client.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) 2011 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_TOOLTIP_CLIENT_H_ -#define UI_AURA_CLIENT_TOOLTIP_CLIENT_H_ -#pragma once - -#include "ui/aura/aura_export.h" -#include "ui/aura/event.h" -#include "ui/gfx/font.h" - -namespace aura { - -class Window; - -class AURA_EXPORT TooltipClient { - public: - // Returns the default font used by tooltips. - static gfx::Font GetDefaultFont(); - - // Returns the maximum width of the tooltip. |x| and |y| give the location - // the tooltip is to be displayed on in screen coordinates. - static int GetMaxWidth(int x, int y); - - // Informs the shell tooltip manager of change in tooltip for window |target|. - virtual void UpdateTooltip(Window* target) = 0; -}; - -} // namespace aura - -#endif // UI_AURA_CLIENT_TOOLTIP_CLIENT_H_ |