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

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

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: plumb through surface ID *and* widget surface ID for window.open Created 5 years, 3 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 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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 bool* proceed_to_fire_unload) override; 577 bool* proceed_to_fire_unload) override;
578 bool ShouldFocusLocationBarByDefault(content::WebContents* source) override; 578 bool ShouldFocusLocationBarByDefault(content::WebContents* source) override;
579 void ViewSourceForTab(content::WebContents* source, 579 void ViewSourceForTab(content::WebContents* source,
580 const GURL& page_url) override; 580 const GURL& page_url) override;
581 void ViewSourceForFrame(content::WebContents* source, 581 void ViewSourceForFrame(content::WebContents* source,
582 const GURL& frame_url, 582 const GURL& frame_url,
583 const content::PageState& frame_page_state) override; 583 const content::PageState& frame_page_state) override;
584 void ShowRepostFormWarningDialog(content::WebContents* source) override; 584 void ShowRepostFormWarningDialog(content::WebContents* source) override;
585 bool ShouldCreateWebContents( 585 bool ShouldCreateWebContents(
586 content::WebContents* web_contents, 586 content::WebContents* web_contents,
587 int route_id, 587 int32 route_id,
588 int main_frame_route_id, 588 int32 main_frame_route_id,
589 int32 main_frame_widget_route_id,
590 int32 surface_id,
589 WindowContainerType window_container_type, 591 WindowContainerType window_container_type,
590 const std::string& frame_name, 592 const std::string& frame_name,
591 const GURL& target_url, 593 const GURL& target_url,
592 const std::string& partition_id, 594 const std::string& partition_id,
593 content::SessionStorageNamespace* session_storage_namespace) override; 595 content::SessionStorageNamespace* session_storage_namespace) override;
594 void WebContentsCreated(content::WebContents* source_contents, 596 void WebContentsCreated(content::WebContents* source_contents,
595 int opener_render_frame_id, 597 int opener_render_frame_id,
596 const std::string& frame_name, 598 const std::string& frame_name,
597 const GURL& target_url, 599 const GURL& target_url,
598 content::WebContents* new_contents) override; 600 content::WebContents* new_contents) override;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 821
820 // Resets |bookmark_bar_state_| based on the active tab. Notifies the 822 // Resets |bookmark_bar_state_| based on the active tab. Notifies the
821 // BrowserWindow if necessary. 823 // BrowserWindow if necessary.
822 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); 824 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason);
823 825
824 bool ShouldHideUIForFullscreen() const; 826 bool ShouldHideUIForFullscreen() const;
825 827
826 // Creates a BackgroundContents if appropriate; return true if one was 828 // Creates a BackgroundContents if appropriate; return true if one was
827 // created. 829 // created.
828 bool MaybeCreateBackgroundContents( 830 bool MaybeCreateBackgroundContents(
829 int route_id, 831 int32 route_id,
830 int main_frame_route_id, 832 int32 main_frame_route_id,
833 int32 main_frame_widget_route_id,
834 int32 surface_id,
831 content::WebContents* opener_web_contents, 835 content::WebContents* opener_web_contents,
832 const std::string& frame_name, 836 const std::string& frame_name,
833 const GURL& target_url, 837 const GURL& target_url,
834 const std::string& partition_id, 838 const std::string& partition_id,
835 content::SessionStorageNamespace* session_storage_namespace); 839 content::SessionStorageNamespace* session_storage_namespace);
836 840
837 // Data members ///////////////////////////////////////////////////////////// 841 // Data members /////////////////////////////////////////////////////////////
838 842
839 std::vector<InterstitialObserver*> interstitial_observers_; 843 std::vector<InterstitialObserver*> interstitial_observers_;
840 844
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 // The following factory is used for chrome update coalescing. 982 // The following factory is used for chrome update coalescing.
979 base::WeakPtrFactory<Browser> chrome_updater_factory_; 983 base::WeakPtrFactory<Browser> chrome_updater_factory_;
980 984
981 // The following factory is used to close the frame at a later time. 985 // The following factory is used to close the frame at a later time.
982 base::WeakPtrFactory<Browser> weak_factory_; 986 base::WeakPtrFactory<Browser> weak_factory_;
983 987
984 DISALLOW_COPY_AND_ASSIGN(Browser); 988 DISALLOW_COPY_AND_ASSIGN(Browser);
985 }; 989 };
986 990
987 #endif // CHROME_BROWSER_UI_BROWSER_H_ 991 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698