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

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
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 virtual void ImeCompositionRangeChanged(const ui::Range& range) OVERRIDE; 199 virtual void ImeCompositionRangeChanged(const ui::Range& range) OVERRIDE;
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 Destroy() OVERRIDE; 205 virtual void Destroy() OVERRIDE;
206 virtual void SetTooltipText(const std::wstring& tooltip_text) OVERRIDE; 206 virtual void SetTooltipText(const std::wstring& tooltip_text) OVERRIDE;
207 virtual void SelectionChanged(const std::string& text, 207 virtual void SelectionChanged(const std::string& text,
208 const ui::Range& range) OVERRIDE; 208 const ui::Range& range) OVERRIDE;
209 virtual void ShowingContextMenu(bool showing) OVERRIDE;
209 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE; 210 virtual BackingStore* AllocBackingStore(const gfx::Size& size) OVERRIDE;
210 virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE; 211 virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE;
211 // See comment in RenderWidgetHostView! 212 // See comment in RenderWidgetHostView!
212 virtual gfx::Rect GetViewCocoaBounds() const OVERRIDE; 213 virtual gfx::Rect GetViewCocoaBounds() const OVERRIDE;
213 virtual gfx::Rect GetRootWindowRect() OVERRIDE; 214 virtual gfx::Rect GetRootWindowRect() OVERRIDE;
214 virtual void SetActive(bool active) OVERRIDE; 215 virtual void SetActive(bool active) OVERRIDE;
215 virtual void SetWindowVisibility(bool visible) OVERRIDE; 216 virtual void SetWindowVisibility(bool visible) OVERRIDE;
216 virtual void WindowFrameChanged() OVERRIDE; 217 virtual void WindowFrameChanged() OVERRIDE;
217 virtual void SetBackground(const SkBitmap& background) OVERRIDE; 218 virtual void SetBackground(const SkBitmap& background) OVERRIDE;
218 219
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 361
361 // The cursor for the page. This is passed up from the renderer. 362 // The cursor for the page. This is passed up from the renderer.
362 WebCursor current_cursor_; 363 WebCursor current_cursor_;
363 364
364 // Indicates if the page is loading. 365 // Indicates if the page is loading.
365 bool is_loading_; 366 bool is_loading_;
366 367
367 // true if the View is not visible. 368 // true if the View is not visible.
368 bool is_hidden_; 369 bool is_hidden_;
369 370
371 // Whether we are showing a context menu.
372 bool is_showing_context_menu_;
373
370 // The text to be shown in the tooltip, supplied by the renderer. 374 // The text to be shown in the tooltip, supplied by the renderer.
371 std::wstring tooltip_text_; 375 std::wstring tooltip_text_;
372 376
373 // Factory used to safely scope delayed calls to ShutdownHost(). 377 // Factory used to safely scope delayed calls to ShutdownHost().
374 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_; 378 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_;
375 379
376 // selected text on the renderer. 380 // selected text on the renderer.
377 std::string selected_text_; 381 std::string selected_text_;
378 382
379 // When rendering transitions from gpu to software, the gpu widget can't be 383 // When rendering transitions from gpu to software, the gpu widget can't be
380 // hidden until the software backing store has been updated. This variable is 384 // hidden until the software backing store has been updated. This variable is
381 // set when the gpu widget needs to be hidden once a paint is completed. 385 // set when the gpu widget needs to be hidden once a paint is completed.
382 bool needs_gpu_visibility_update_after_repaint_; 386 bool needs_gpu_visibility_update_after_repaint_;
383 387
384 gfx::PluginWindowHandle compositing_surface_; 388 gfx::PluginWindowHandle compositing_surface_;
385 389
386 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 390 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
387 }; 391 };
388 392
389 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 393 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698