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

Side by Side Diff: chrome/browser/tab_contents/tab_contents_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_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #import <Cocoa/Cocoa.h> 9 #import <Cocoa/Cocoa.h>
10 10
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/memory/scoped_nsobject.h" 14 #include "base/memory/scoped_nsobject.h"
15 #include "base/memory/scoped_ptr.h"
15 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" 16 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
16 #include "chrome/browser/ui/cocoa/base_view.h" 17 #include "chrome/browser/ui/cocoa/base_view.h"
17 #include "content/browser/tab_contents/tab_contents_view.h" 18 #include "content/browser/tab_contents/tab_contents_view.h"
18 #include "content/common/notification_observer.h" 19 #include "content/common/notification_observer.h"
19 #include "content/common/notification_registrar.h" 20 #include "content/common/notification_registrar.h"
20 #include "ui/gfx/size.h" 21 #include "ui/gfx/size.h"
21 22
22 @class FocusTracker; 23 @class FocusTracker;
24 class RenderViewContextMenuMac;
23 @class SadTabController; 25 @class SadTabController;
24 class SkBitmap; 26 class SkBitmap;
25 class TabContentsViewMac; 27 class TabContentsViewMac;
26 @class WebDragSource; 28 @class WebDragSource;
27 @class WebDropTarget; 29 @class WebDropTarget;
28 namespace gfx { 30 namespace gfx {
29 class Point; 31 class Point;
30 } 32 }
31 33
32 @interface TabContentsViewCocoa : BaseView { 34 @interface TabContentsViewCocoa : BaseView {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // focus returns. 132 // focus returns.
131 scoped_nsobject<FocusTracker> focus_tracker_; 133 scoped_nsobject<FocusTracker> focus_tracker_;
132 134
133 // Used to get notifications about renderers coming and going. 135 // Used to get notifications about renderers coming and going.
134 NotificationRegistrar registrar_; 136 NotificationRegistrar registrar_;
135 137
136 // Used to render the sad tab. This will be non-NULL only when the sad tab is 138 // Used to render the sad tab. This will be non-NULL only when the sad tab is
137 // visible. 139 // visible.
138 scoped_nsobject<SadTabController> sad_tab_; 140 scoped_nsobject<SadTabController> sad_tab_;
139 141
142 // The context menu. Callbacks are asynchronous so we need to keep it around.
143 scoped_ptr<RenderViewContextMenuMac> context_menu_;
144
140 // The page content's intrinsic width. 145 // The page content's intrinsic width.
141 int preferred_width_; 146 int preferred_width_;
142 147
143 DISALLOW_COPY_AND_ASSIGN(TabContentsViewMac); 148 DISALLOW_COPY_AND_ASSIGN(TabContentsViewMac);
144 }; 149 };
145 150
146 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_ 151 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.cc ('k') | chrome/browser/tab_contents/tab_contents_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698