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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 1137653005: MacViews: Implement Tooltips (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: respond to comments Created 5 years, 7 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: content/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 0c8ba4b4a283aec3e93c0b0db518a49b76331d48..e1b5f430eae9248626a373acfeabaa480b50d78c 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -31,8 +31,8 @@
#include "third_party/WebKit/public/web/WebCompositionUnderline.h"
#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
#include "ui/accelerated_widget_mac/io_surface_layer.h"
-#include "ui/base/cocoa/base_view.h"
#include "ui/base/cocoa/remote_layer_api.h"
+#import "ui/base/cocoa/tool_tip_base_view.h"
#include "ui/gfx/display_observer.h"
namespace content {
@@ -49,7 +49,6 @@ class Layer;
@class FullscreenWindowManager;
@protocol RenderWidgetHostViewMacDelegate;
-@class ToolTip;
@protocol RenderWidgetHostViewMacOwner
- (content::RenderWidgetHostViewMac*)renderWidgetHostViewMac;
@@ -60,9 +59,9 @@ class Layer;
// but that means that the view needs to own the delegate and will dispose of it
// when it's removed from the view system.
@interface RenderWidgetHostViewCocoa
- : BaseView <RenderWidgetHostViewMacBase,
- RenderWidgetHostViewMacOwner,
- NSTextInputClient> {
+ : ToolTipBaseView<RenderWidgetHostViewMacBase,
+ RenderWidgetHostViewMacOwner,
+ NSTextInputClient> {
@private
scoped_ptr<content::RenderWidgetHostViewMac> renderWidgetHostView_;
// This ivar is the cocoa delegate of the NSResponder.
@@ -74,12 +73,6 @@ class Layer;
scoped_ptr<content::RenderWidgetHostViewMacEditCommandHelper>
editCommand_helper_;
- // These are part of the magic tooltip code from WebKit's WebHTMLView:
- id trackingRectOwner_; // (not retained)
- void* trackingRectUserData_;
- NSTrackingRectTag lastToolTipTag_;
- base::scoped_nsobject<NSString> toolTip_;
-
// Is YES if there was a mouse-down as yet unbalanced with a mouse-up.
BOOL hasOpenMouseDown_;
@@ -194,7 +187,6 @@ class Layer;
- (void)setCanBeKeyView:(BOOL)can;
- (void)setCloseOnDeactivate:(BOOL)b;
- (void)setOpaque:(BOOL)opaque;
-- (void)setToolTipAtMousePoint:(NSString *)string;
// True for always-on-top special windows (e.g. Balloons and Panels).
- (BOOL)acceptsMouseEventsWhenInactive;
// Cancel ongoing composition (abandon the marked text).
« no previous file with comments | « android_webview/tools/third_party_files_whitelist.txt ('k') | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698