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

Side by Side Diff: content/browser/web_contents/web_contents_view_mac.h

Issue 468193005: Remove SetAllowOverlappingView from RWHVMac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_ca_flag
Patch Set: Created 6 years, 4 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
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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 virtual gfx::NativeView GetContentNativeView() const OVERRIDE; 70 virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
71 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; 71 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
72 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE; 72 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
73 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 73 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
74 virtual void Focus() OVERRIDE; 74 virtual void Focus() OVERRIDE;
75 virtual void SetInitialFocus() OVERRIDE; 75 virtual void SetInitialFocus() OVERRIDE;
76 virtual void StoreFocus() OVERRIDE; 76 virtual void StoreFocus() OVERRIDE;
77 virtual void RestoreFocus() OVERRIDE; 77 virtual void RestoreFocus() OVERRIDE;
78 virtual DropData* GetDropData() const OVERRIDE; 78 virtual DropData* GetDropData() const OVERRIDE;
79 virtual gfx::Rect GetViewBounds() const OVERRIDE; 79 virtual gfx::Rect GetViewBounds() const OVERRIDE;
80 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
81 virtual bool GetAllowOverlappingViews() const OVERRIDE;
82 virtual void SetAllowOtherViews(bool allow) OVERRIDE; 80 virtual void SetAllowOtherViews(bool allow) OVERRIDE;
83 virtual bool GetAllowOtherViews() const OVERRIDE; 81 virtual bool GetAllowOtherViews() const OVERRIDE;
84 virtual void CreateView( 82 virtual void CreateView(
85 const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE; 83 const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE;
86 virtual RenderWidgetHostViewBase* CreateViewForWidget( 84 virtual RenderWidgetHostViewBase* CreateViewForWidget(
87 RenderWidgetHost* render_widget_host) OVERRIDE; 85 RenderWidgetHost* render_widget_host) OVERRIDE;
88 virtual RenderWidgetHostViewBase* CreateViewForPopupWidget( 86 virtual RenderWidgetHostViewBase* CreateViewForPopupWidget(
89 RenderWidgetHost* render_widget_host) OVERRIDE; 87 RenderWidgetHost* render_widget_host) OVERRIDE;
90 virtual void SetPageTitle(const base::string16& title) OVERRIDE; 88 virtual void SetPageTitle(const base::string16& title) OVERRIDE;
91 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; 89 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // The Cocoa NSView that lives in the view hierarchy. 126 // The Cocoa NSView that lives in the view hierarchy.
129 base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_; 127 base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_;
130 128
131 // Keeps track of which NSView has focus so we can restore the focus when 129 // Keeps track of which NSView has focus so we can restore the focus when
132 // focus returns. 130 // focus returns.
133 base::scoped_nsobject<FocusTracker> focus_tracker_; 131 base::scoped_nsobject<FocusTracker> focus_tracker_;
134 132
135 // Our optional delegate. 133 // Our optional delegate.
136 scoped_ptr<WebContentsViewDelegate> delegate_; 134 scoped_ptr<WebContentsViewDelegate> delegate_;
137 135
138 // Whether to allow overlapping views.
139 bool allow_overlapping_views_;
140
141 // Whether to allow other views. 136 // Whether to allow other views.
142 bool allow_other_views_; 137 bool allow_other_views_;
143 138
144 scoped_ptr<PopupMenuHelper> popup_menu_helper_; 139 scoped_ptr<PopupMenuHelper> popup_menu_helper_;
145 140
146 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 141 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
147 }; 142 };
148 143
149 } // namespace content 144 } // namespace content
150 145
151 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 146 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_guest.cc ('k') | content/browser/web_contents/web_contents_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698