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

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

Issue 137403005: Remove some code inside USE_AURA and OS_WIN ifdefs. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 virtual int GetRoutingID() const OVERRIDE; 198 virtual int GetRoutingID() const OVERRIDE;
199 virtual RenderWidgetHostView* GetRenderWidgetHostView() const OVERRIDE; 199 virtual RenderWidgetHostView* GetRenderWidgetHostView() const OVERRIDE;
200 virtual RenderWidgetHostView* GetFullscreenRenderWidgetHostView() const 200 virtual RenderWidgetHostView* GetFullscreenRenderWidgetHostView() const
201 OVERRIDE; 201 OVERRIDE;
202 virtual WebContentsView* GetView() const OVERRIDE; 202 virtual WebContentsView* GetView() const OVERRIDE;
203 virtual WebUI* CreateWebUI(const GURL& url) OVERRIDE; 203 virtual WebUI* CreateWebUI(const GURL& url) OVERRIDE;
204 virtual WebUI* GetWebUI() const OVERRIDE; 204 virtual WebUI* GetWebUI() const OVERRIDE;
205 virtual WebUI* GetCommittedWebUI() const OVERRIDE; 205 virtual WebUI* GetCommittedWebUI() const OVERRIDE;
206 virtual void SetUserAgentOverride(const std::string& override) OVERRIDE; 206 virtual void SetUserAgentOverride(const std::string& override) OVERRIDE;
207 virtual const std::string& GetUserAgentOverride() const OVERRIDE; 207 virtual const std::string& GetUserAgentOverride() const OVERRIDE;
208 #if defined(OS_WIN) && defined(USE_AURA) 208 #if defined(OS_WIN)
209 virtual void SetParentNativeViewAccessible( 209 virtual void SetParentNativeViewAccessible(
210 gfx::NativeViewAccessible accessible_parent) OVERRIDE; 210 gfx::NativeViewAccessible accessible_parent) OVERRIDE;
211 #endif 211 #endif
212 virtual const base::string16& GetTitle() const OVERRIDE; 212 virtual const base::string16& GetTitle() const OVERRIDE;
213 virtual int32 GetMaxPageID() OVERRIDE; 213 virtual int32 GetMaxPageID() OVERRIDE;
214 virtual int32 GetMaxPageIDForSiteInstance( 214 virtual int32 GetMaxPageIDForSiteInstance(
215 SiteInstance* site_instance) OVERRIDE; 215 SiteInstance* site_instance) OVERRIDE;
216 virtual SiteInstance* GetSiteInstance() const OVERRIDE; 216 virtual SiteInstance* GetSiteInstance() const OVERRIDE;
217 virtual SiteInstance* GetPendingSiteInstance() const OVERRIDE; 217 virtual SiteInstance* GetPendingSiteInstance() const OVERRIDE;
218 virtual bool IsLoading() const OVERRIDE; 218 virtual bool IsLoading() const OVERRIDE;
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 virtual void RenderWidgetDeleted( 471 virtual void RenderWidgetDeleted(
472 RenderWidgetHostImpl* render_widget_host) OVERRIDE; 472 RenderWidgetHostImpl* render_widget_host) OVERRIDE;
473 virtual bool PreHandleKeyboardEvent( 473 virtual bool PreHandleKeyboardEvent(
474 const NativeWebKeyboardEvent& event, 474 const NativeWebKeyboardEvent& event,
475 bool* is_keyboard_shortcut) OVERRIDE; 475 bool* is_keyboard_shortcut) OVERRIDE;
476 virtual void HandleKeyboardEvent( 476 virtual void HandleKeyboardEvent(
477 const NativeWebKeyboardEvent& event) OVERRIDE; 477 const NativeWebKeyboardEvent& event) OVERRIDE;
478 virtual bool PreHandleWheelEvent( 478 virtual bool PreHandleWheelEvent(
479 const blink::WebMouseWheelEvent& event) OVERRIDE; 479 const blink::WebMouseWheelEvent& event) OVERRIDE;
480 virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE; 480 virtual void DidSendScreenRects(RenderWidgetHostImpl* rwh) OVERRIDE;
481 #if defined(OS_WIN) && defined(USE_AURA) 481 #if defined(OS_WIN)
482 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE; 482 virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
483 #endif 483 #endif
484 484
485 // RenderFrameHostManager::Delegate ------------------------------------------ 485 // RenderFrameHostManager::Delegate ------------------------------------------
486 486
487 virtual bool CreateRenderViewForRenderManager( 487 virtual bool CreateRenderViewForRenderManager(
488 RenderViewHost* render_view_host, int opener_route_id) OVERRIDE; 488 RenderViewHost* render_view_host, int opener_route_id) OVERRIDE;
489 virtual void BeforeUnloadFiredFromRenderManager( 489 virtual void BeforeUnloadFiredFromRenderManager(
490 bool proceed, const base::TimeTicks& proceed_time, 490 bool proceed, const base::TimeTicks& proceed_time,
491 bool* proceed_to_fire_unload) OVERRIDE; 491 bool* proceed_to_fire_unload) OVERRIDE;
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 // A list of observers notified when page state changes. Weak references. 868 // A list of observers notified when page state changes. Weak references.
869 // This MUST be listed above frame_tree_ since at destruction time the 869 // This MUST be listed above frame_tree_ since at destruction time the
870 // latter might cause RenderViewHost's destructor to call us and we might use 870 // latter might cause RenderViewHost's destructor to call us and we might use
871 // the observer list then. 871 // the observer list then.
872 ObserverList<WebContentsObserver> observers_; 872 ObserverList<WebContentsObserver> observers_;
873 873
874 // The tab that opened this tab, if any. Will be set to null if the opener 874 // The tab that opened this tab, if any. Will be set to null if the opener
875 // is closed. 875 // is closed.
876 WebContentsImpl* opener_; 876 WebContentsImpl* opener_;
877 877
878 #if defined(OS_WIN) && defined(USE_AURA) 878 #if defined(OS_WIN)
879 gfx::NativeViewAccessible accessible_parent_; 879 gfx::NativeViewAccessible accessible_parent_;
880 #endif 880 #endif
881 881
882 // Helper classes ------------------------------------------------------------ 882 // Helper classes ------------------------------------------------------------
883 883
884 // Maps the RenderViewHost to its media_player_cookie and PowerSaveBlocker 884 // Maps the RenderViewHost to its media_player_cookie and PowerSaveBlocker
885 // pairs. Key is the RenderViewHost, value is the map which maps player_cookie 885 // pairs. Key is the RenderViewHost, value is the map which maps player_cookie
886 // on to PowerSaveBlocker. 886 // on to PowerSaveBlocker.
887 typedef std::map<RenderViewHost*, std::map<int64, PowerSaveBlocker*> > 887 typedef std::map<RenderViewHost*, std::map<int64, PowerSaveBlocker*> >
888 PowerSaveBlockerMap; 888 PowerSaveBlockerMap;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 // Whether this WebContents is responsible for displaying a subframe in a 1042 // Whether this WebContents is responsible for displaying a subframe in a
1043 // different process from its parent page. 1043 // different process from its parent page.
1044 bool is_subframe_; 1044 bool is_subframe_;
1045 1045
1046 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1046 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1047 }; 1047 };
1048 1048
1049 } // namespace content 1049 } // namespace content
1050 1050
1051 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1051 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698