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

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

Issue 388803003: [Mac] Replace SetOverlayView with AllowOtherViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased, fixed comments Created 6 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) 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_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 const base::string16& search_text, 302 const base::string16& search_text,
303 const blink::WebFindOptions& options) OVERRIDE; 303 const blink::WebFindOptions& options) OVERRIDE;
304 virtual void StopFinding(StopFindAction action) OVERRIDE; 304 virtual void StopFinding(StopFindAction action) OVERRIDE;
305 virtual void InsertCSS(const std::string& css) OVERRIDE; 305 virtual void InsertCSS(const std::string& css) OVERRIDE;
306 #if defined(OS_ANDROID) 306 #if defined(OS_ANDROID)
307 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() 307 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents()
308 OVERRIDE; 308 OVERRIDE;
309 #elif defined(OS_MACOSX) 309 #elif defined(OS_MACOSX)
310 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE; 310 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
311 virtual bool GetAllowOverlappingViews() OVERRIDE; 311 virtual bool GetAllowOverlappingViews() OVERRIDE;
312 virtual void SetOverlayView(WebContents* overlay, 312 virtual void SetAllowOtherViews(bool allow) OVERRIDE;
313 const gfx::Point& offset) OVERRIDE; 313 virtual bool GetAllowOtherViews() OVERRIDE;
314 virtual void RemoveOverlayView() OVERRIDE;
315 #endif 314 #endif
316 315
317 // Implementation of PageNavigator. 316 // Implementation of PageNavigator.
318 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE; 317 virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE;
319 318
320 // Implementation of IPC::Sender. 319 // Implementation of IPC::Sender.
321 virtual bool Send(IPC::Message* message) OVERRIDE; 320 virtual bool Send(IPC::Message* message) OVERRIDE;
322 321
323 // RenderFrameHostDelegate --------------------------------------------------- 322 // RenderFrameHostDelegate ---------------------------------------------------
324 virtual bool OnMessageReceived(RenderFrameHost* render_frame_host, 323 virtual bool OnMessageReceived(RenderFrameHost* render_frame_host,
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 1152
1154 scoped_ptr<ScreenOrientationDispatcherHost> 1153 scoped_ptr<ScreenOrientationDispatcherHost>
1155 screen_orientation_dispatcher_host_; 1154 screen_orientation_dispatcher_host_;
1156 1155
1157 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1156 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1158 }; 1157 };
1159 1158
1160 } // namespace content 1159 } // namespace content
1161 1160
1162 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1161 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698