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

Side by Side Diff: chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h

Issue 9382037: Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 10 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHROME_TAB_CONTENTS_VIEW_WRAPPER_GTK_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_CHROME_TAB_CONTENTS_VIEW_WRAPPER_GTK_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_CHROME_TAB_CONTENTS_VIEW_WRAPPER_GTK_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_CHROME_TAB_CONTENTS_VIEW_WRAPPER_GTK_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 20 matching lines...) Expand all
31 void RemoveConstrainedWindow(ConstrainedWindowGtk* constrained_window); 31 void RemoveConstrainedWindow(ConstrainedWindowGtk* constrained_window);
32 32
33 // Overridden from TabContentsViewGtkWrapper: 33 // Overridden from TabContentsViewGtkWrapper:
34 virtual void WrapView(content::TabContentsViewGtk* view) OVERRIDE; 34 virtual void WrapView(content::TabContentsViewGtk* view) OVERRIDE;
35 virtual gfx::NativeView GetNativeView() const OVERRIDE; 35 virtual gfx::NativeView GetNativeView() const OVERRIDE;
36 virtual void OnCreateViewForWidget() OVERRIDE; 36 virtual void OnCreateViewForWidget() OVERRIDE;
37 virtual void Focus() OVERRIDE; 37 virtual void Focus() OVERRIDE;
38 virtual gboolean OnNativeViewFocusEvent(GtkWidget* widget, 38 virtual gboolean OnNativeViewFocusEvent(GtkWidget* widget,
39 GtkDirectionType type, 39 GtkDirectionType type,
40 gboolean* return_value) OVERRIDE; 40 gboolean* return_value) OVERRIDE;
41 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; 41 virtual void ShowContextMenu(
42 const content::ContextMenuParams& params) OVERRIDE;
42 43
43 private: 44 private:
44 // Sets the location of the constrained windows. 45 // Sets the location of the constrained windows.
45 CHROMEGTK_CALLBACK_1(ChromeTabContentsViewWrapperGtk, void, 46 CHROMEGTK_CALLBACK_1(ChromeTabContentsViewWrapperGtk, void,
46 OnSetFloatingPosition, 47 OnSetFloatingPosition,
47 GtkAllocation*); 48 GtkAllocation*);
48 49
49 // Contains |expanded_| as its GtkBin member. 50 // Contains |expanded_| as its GtkBin member.
50 ui::OwnedWidgetGtk floating_; 51 ui::OwnedWidgetGtk floating_;
51 52
52 // Our owner. Also owns our child widgets. 53 // Our owner. Also owns our child widgets.
53 content::TabContentsViewGtk* view_; 54 content::TabContentsViewGtk* view_;
54 55
55 // The UI for the constrained dialog currently displayed. This is owned by 56 // The UI for the constrained dialog currently displayed. This is owned by
56 // TabContents, not the view. 57 // TabContents, not the view.
57 ConstrainedWindowGtk* constrained_window_; 58 ConstrainedWindowGtk* constrained_window_;
58 59
59 // The context menu is reset every time we show it, but we keep a pointer to 60 // The context menu is reset every time we show it, but we keep a pointer to
60 // between uses so that it won't go out of scope before we're done with it. 61 // between uses so that it won't go out of scope before we're done with it.
61 scoped_ptr<RenderViewContextMenuGtk> context_menu_; 62 scoped_ptr<RenderViewContextMenuGtk> context_menu_;
62 63
63 // The chrome specific delegate that receives events from WebDragDestGtk. 64 // The chrome specific delegate that receives events from WebDragDestGtk.
64 scoped_ptr<WebDragBookmarkHandlerGtk> bookmark_handler_gtk_; 65 scoped_ptr<WebDragBookmarkHandlerGtk> bookmark_handler_gtk_;
65 }; 66 };
66 67
67 #endif // CHROME_BROWSER_TAB_CONTENTS_CHROME_TAB_CONTENTS_VIEW_WRAPPER_GTK_H_ 68 #endif // CHROME_BROWSER_TAB_CONTENTS_CHROME_TAB_CONTENTS_VIEW_WRAPPER_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698