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

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

Issue 950223006: Fix RenderFrameHostChanged WebContentsObserver methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes based on Charlie's review. Created 5 years, 9 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_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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 bool proceed, 561 bool proceed,
562 const base::TimeTicks& proceed_time, 562 const base::TimeTicks& proceed_time,
563 bool* proceed_to_fire_unload) override; 563 bool* proceed_to_fire_unload) override;
564 void RenderProcessGoneFromRenderManager( 564 void RenderProcessGoneFromRenderManager(
565 RenderViewHost* render_view_host) override; 565 RenderViewHost* render_view_host) override;
566 void UpdateRenderViewSizeForRenderManager() override; 566 void UpdateRenderViewSizeForRenderManager() override;
567 void CancelModalDialogsForRenderManager() override; 567 void CancelModalDialogsForRenderManager() override;
568 void NotifySwappedFromRenderManager(RenderFrameHost* old_host, 568 void NotifySwappedFromRenderManager(RenderFrameHost* old_host,
569 RenderFrameHost* new_host, 569 RenderFrameHost* new_host,
570 bool is_main_frame) override; 570 bool is_main_frame) override;
571 void NotifyMainFrameSwappedFromRenderManager(
572 RenderViewHost* old_host,
573 RenderViewHost* new_host) override;
571 int CreateOpenerRenderViewsForRenderManager(SiteInstance* instance) override; 574 int CreateOpenerRenderViewsForRenderManager(SiteInstance* instance) override;
572 NavigationControllerImpl& GetControllerForRenderManager() override; 575 NavigationControllerImpl& GetControllerForRenderManager() override;
573 scoped_ptr<WebUIImpl> CreateWebUIForRenderManager(const GURL& url) override; 576 scoped_ptr<WebUIImpl> CreateWebUIForRenderManager(const GURL& url) override;
574 NavigationEntry* GetLastCommittedNavigationEntryForRenderManager() override; 577 NavigationEntry* GetLastCommittedNavigationEntryForRenderManager() override;
575 bool FocusLocationBarByDefault() override; 578 bool FocusLocationBarByDefault() override;
576 void SetFocusToLocationBar(bool select_all) override; 579 void SetFocusToLocationBar(bool select_all) override;
577 bool IsHidden() override; 580 bool IsHidden() override;
578 581
579 // NotificationObserver ------------------------------------------------------ 582 // NotificationObserver ------------------------------------------------------
580 583
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 // Adds/removes a callback called on creation of each new WebContents. 1270 // Adds/removes a callback called on creation of each new WebContents.
1268 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1271 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1269 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1272 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1270 1273
1271 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1274 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1272 }; 1275 };
1273 1276
1274 } // namespace content 1277 } // namespace content
1275 1278
1276 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1279 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698