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

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

Issue 1472703004: Reland #2 of: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tests simulatneous navigation involving WebUIs; minor test improvements. Created 5 years 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_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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 RenderFrameHost* render_frame_host, 433 RenderFrameHost* render_frame_host,
434 int browser_plugin_instance_id) override; 434 int browser_plugin_instance_id) override;
435 GeolocationServiceContext* GetGeolocationServiceContext() override; 435 GeolocationServiceContext* GetGeolocationServiceContext() override;
436 WakeLockServiceContext* GetWakeLockServiceContext() override; 436 WakeLockServiceContext* GetWakeLockServiceContext() override;
437 void EnterFullscreenMode(const GURL& origin) override; 437 void EnterFullscreenMode(const GURL& origin) override;
438 void ExitFullscreenMode() override; 438 void ExitFullscreenMode() override;
439 bool ShouldRouteMessageEvent( 439 bool ShouldRouteMessageEvent(
440 RenderFrameHost* target_rfh, 440 RenderFrameHost* target_rfh,
441 SiteInstance* source_site_instance) const override; 441 SiteInstance* source_site_instance) const override;
442 void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override; 442 void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override;
443 scoped_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(const GURL& url) override;
443 #if defined(OS_WIN) 444 #if defined(OS_WIN)
444 gfx::NativeViewAccessible GetParentNativeViewAccessible() override; 445 gfx::NativeViewAccessible GetParentNativeViewAccessible() override;
445 #endif 446 #endif
446 447
447 // RenderViewHostDelegate ---------------------------------------------------- 448 // RenderViewHostDelegate ----------------------------------------------------
448 RenderViewHostDelegateView* GetDelegateView() override; 449 RenderViewHostDelegateView* GetDelegateView() override;
449 bool OnMessageReceived(RenderViewHost* render_view_host, 450 bool OnMessageReceived(RenderViewHost* render_view_host,
450 const IPC::Message& message) override; 451 const IPC::Message& message) override;
451 // RenderFrameHostDelegate has the same method, so list it there because this 452 // RenderFrameHostDelegate has the same method, so list it there because this
452 // interface is going away. 453 // interface is going away.
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 RenderViewHost* render_view_host) override; 630 RenderViewHost* render_view_host) override;
630 void UpdateRenderViewSizeForRenderManager() override; 631 void UpdateRenderViewSizeForRenderManager() override;
631 void CancelModalDialogsForRenderManager() override; 632 void CancelModalDialogsForRenderManager() override;
632 void NotifySwappedFromRenderManager(RenderFrameHost* old_host, 633 void NotifySwappedFromRenderManager(RenderFrameHost* old_host,
633 RenderFrameHost* new_host, 634 RenderFrameHost* new_host,
634 bool is_main_frame) override; 635 bool is_main_frame) override;
635 void NotifyMainFrameSwappedFromRenderManager( 636 void NotifyMainFrameSwappedFromRenderManager(
636 RenderViewHost* old_host, 637 RenderViewHost* old_host,
637 RenderViewHost* new_host) override; 638 RenderViewHost* new_host) override;
638 NavigationControllerImpl& GetControllerForRenderManager() override; 639 NavigationControllerImpl& GetControllerForRenderManager() override;
639 scoped_ptr<WebUIImpl> CreateWebUIForRenderManager(const GURL& url) override;
640 NavigationEntry* GetLastCommittedNavigationEntryForRenderManager() override; 640 NavigationEntry* GetLastCommittedNavigationEntryForRenderManager() override;
641 bool FocusLocationBarByDefault() override; 641 bool FocusLocationBarByDefault() override;
642 void SetFocusToLocationBar(bool select_all) override; 642 void SetFocusToLocationBar(bool select_all) override;
643 bool IsHidden() override; 643 bool IsHidden() override;
644 int GetOuterDelegateFrameTreeNodeID() override; 644 int GetOuterDelegateFrameTreeNodeID() override;
645 645
646 // NotificationObserver ------------------------------------------------------ 646 // NotificationObserver ------------------------------------------------------
647 647
648 void Observe(int type, 648 void Observe(int type,
649 const NotificationSource& source, 649 const NotificationSource& source,
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1350 // Adds/removes a callback called on creation of each new WebContents. 1350 // Adds/removes a callback called on creation of each new WebContents.
1351 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1351 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1352 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1352 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1353 1353
1354 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1354 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1355 }; 1355 };
1356 1356
1357 } // namespace content 1357 } // namespace content
1358 1358
1359 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1359 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698