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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_mac.h

Issue 7227007: [Mac] Show correct cursor after context menu is closed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #import <Cocoa/Cocoa.h> 9 #import <Cocoa/Cocoa.h>
10 10
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 virtual void DidUpdateBackingStore( 200 virtual void DidUpdateBackingStore(
201 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, 201 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy,
202 const std::vector<gfx::Rect>& copy_rects) OVERRIDE; 202 const std::vector<gfx::Rect>& copy_rects) OVERRIDE;
203 virtual void RenderViewGone(base::TerminationStatus status, 203 virtual void RenderViewGone(base::TerminationStatus status,
204 int error_code) OVERRIDE; 204 int error_code) OVERRIDE;
205 virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) OVERRIDE {}; 205 virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) OVERRIDE {};
206 virtual void Destroy() OVERRIDE; 206 virtual void Destroy() OVERRIDE;
207 virtual void SetTooltipText(const std::wstring& tooltip_text) OVERRIDE; 207 virtual void SetTooltipText(const std::wstring& tooltip_text) OVERRIDE;
208 virtual void SelectionChanged(const std::string& text, 208 virtual void SelectionChanged(const std::string& text,
209 const ui::Range& range) OVERRIDE; 209 const ui::Range& range) OVERRIDE;
210 virtual void ShowingContextMenu(bool showing) OVERRIDE;
210 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; 211 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
211 virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE; 212 virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE;
212 // See comment in RenderWidgetHostView! 213 // See comment in RenderWidgetHostView!
213 virtual gfx::Rect GetViewCocoaBounds() const OVERRIDE; 214 virtual gfx::Rect GetViewCocoaBounds() const OVERRIDE;
214 virtual gfx::Rect GetRootWindowRect() OVERRIDE; 215 virtual gfx::Rect GetRootWindowRect() OVERRIDE;
215 virtual void SetActive(bool active) OVERRIDE; 216 virtual void SetActive(bool active) OVERRIDE;
216 virtual void SetWindowVisibility(bool visible) OVERRIDE; 217 virtual void SetWindowVisibility(bool visible) OVERRIDE;
217 virtual void WindowFrameChanged() OVERRIDE; 218 virtual void WindowFrameChanged() OVERRIDE;
218 virtual void SetBackground(const SkBitmap& background) OVERRIDE; 219 virtual void SetBackground(const SkBitmap& background) OVERRIDE;
219 virtual bool ContainsNativeView(gfx::NativeView native_view) const OVERRIDE; 220 virtual bool ContainsNativeView(gfx::NativeView native_view) const OVERRIDE;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 363
363 // The cursor for the page. This is passed up from the renderer. 364 // The cursor for the page. This is passed up from the renderer.
364 WebCursor current_cursor_; 365 WebCursor current_cursor_;
365 366
366 // Indicates if the page is loading. 367 // Indicates if the page is loading.
367 bool is_loading_; 368 bool is_loading_;
368 369
369 // true if the View is not visible. 370 // true if the View is not visible.
370 bool is_hidden_; 371 bool is_hidden_;
371 372
373 // Whether we are showing a context menu.
374 bool is_showing_context_menu_;
375
372 // The text to be shown in the tooltip, supplied by the renderer. 376 // The text to be shown in the tooltip, supplied by the renderer.
373 std::wstring tooltip_text_; 377 std::wstring tooltip_text_;
374 378
375 // Factory used to safely scope delayed calls to ShutdownHost(). 379 // Factory used to safely scope delayed calls to ShutdownHost().
376 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_; 380 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_;
377 381
378 // selected text on the renderer. 382 // selected text on the renderer.
379 std::string selected_text_; 383 std::string selected_text_;
380 384
381 // When rendering transitions from gpu to software, the gpu widget can't be 385 // When rendering transitions from gpu to software, the gpu widget can't be
382 // hidden until the software backing store has been updated. This variable is 386 // hidden until the software backing store has been updated. This variable is
383 // set when the gpu widget needs to be hidden once a paint is completed. 387 // set when the gpu widget needs to be hidden once a paint is completed.
384 bool needs_gpu_visibility_update_after_repaint_; 388 bool needs_gpu_visibility_update_after_repaint_;
385 389
386 gfx::PluginWindowHandle compositing_surface_; 390 gfx::PluginWindowHandle compositing_surface_;
387 391
388 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 392 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
389 }; 393 };
390 394
391 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 395 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698