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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 790423002: Add the main frame routing ID to WebContentsDelegate, use it in BackgroundContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chromeos Created 6 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 CHROME_BROWSER_UI_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 int GetExtraRenderViewHeight() const override; 575 int GetExtraRenderViewHeight() const override;
576 void ViewSourceForTab(content::WebContents* source, 576 void ViewSourceForTab(content::WebContents* source,
577 const GURL& page_url) override; 577 const GURL& page_url) override;
578 void ViewSourceForFrame(content::WebContents* source, 578 void ViewSourceForFrame(content::WebContents* source,
579 const GURL& frame_url, 579 const GURL& frame_url,
580 const content::PageState& frame_page_state) override; 580 const content::PageState& frame_page_state) override;
581 void ShowRepostFormWarningDialog(content::WebContents* source) override; 581 void ShowRepostFormWarningDialog(content::WebContents* source) override;
582 bool ShouldCreateWebContents( 582 bool ShouldCreateWebContents(
583 content::WebContents* web_contents, 583 content::WebContents* web_contents,
584 int route_id, 584 int route_id,
585 int main_frame_route_id,
585 WindowContainerType window_container_type, 586 WindowContainerType window_container_type,
586 const base::string16& frame_name, 587 const base::string16& frame_name,
587 const GURL& target_url, 588 const GURL& target_url,
588 const std::string& partition_id, 589 const std::string& partition_id,
589 content::SessionStorageNamespace* session_storage_namespace) override; 590 content::SessionStorageNamespace* session_storage_namespace) override;
590 void WebContentsCreated(content::WebContents* source_contents, 591 void WebContentsCreated(content::WebContents* source_contents,
591 int opener_render_frame_id, 592 int opener_render_frame_id,
592 const base::string16& frame_name, 593 const base::string16& frame_name,
593 const GURL& target_url, 594 const GURL& target_url,
594 content::WebContents* new_contents) override; 595 content::WebContents* new_contents) override;
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 // Resets |bookmark_bar_state_| based on the active tab. Notifies the 810 // Resets |bookmark_bar_state_| based on the active tab. Notifies the
810 // BrowserWindow if necessary. 811 // BrowserWindow if necessary.
811 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); 812 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason);
812 813
813 bool ShouldHideUIForFullscreen() const; 814 bool ShouldHideUIForFullscreen() const;
814 815
815 // Creates a BackgroundContents if appropriate; return true if one was 816 // Creates a BackgroundContents if appropriate; return true if one was
816 // created. 817 // created.
817 bool MaybeCreateBackgroundContents( 818 bool MaybeCreateBackgroundContents(
818 int route_id, 819 int route_id,
820 int main_frame_route_id,
819 content::WebContents* opener_web_contents, 821 content::WebContents* opener_web_contents,
820 const base::string16& frame_name, 822 const base::string16& frame_name,
821 const GURL& target_url, 823 const GURL& target_url,
822 const std::string& partition_id, 824 const std::string& partition_id,
823 content::SessionStorageNamespace* session_storage_namespace); 825 content::SessionStorageNamespace* session_storage_namespace);
824 826
825 // Data members ///////////////////////////////////////////////////////////// 827 // Data members /////////////////////////////////////////////////////////////
826 828
827 std::vector<InterstitialObserver*> interstitial_observers_; 829 std::vector<InterstitialObserver*> interstitial_observers_;
828 830
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
967 969
968 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; 970 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_;
969 971
970 // The following factory is used to close the frame at a later time. 972 // The following factory is used to close the frame at a later time.
971 base::WeakPtrFactory<Browser> weak_factory_; 973 base::WeakPtrFactory<Browser> weak_factory_;
972 974
973 DISALLOW_COPY_AND_ASSIGN(Browser); 975 DISALLOW_COPY_AND_ASSIGN(Browser);
974 }; 976 };
975 977
976 #endif // CHROME_BROWSER_UI_BROWSER_H_ 978 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698