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

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

Issue 143463012: Pass rendering state on swapping in a prerendered page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dev
Patch Set: sync Created 6 years, 10 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
« no previous file with comments | « chrome/browser/sessions/session_restore_android.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 content::WebContents* web_contents, 641 content::WebContents* web_contents,
642 const GURL& url, 642 const GURL& url,
643 const base::FilePath& plugin_path, 643 const base::FilePath& plugin_path,
644 const base::Callback<void(bool)>& callback) OVERRIDE; 644 const base::Callback<void(bool)>& callback) OVERRIDE;
645 virtual gfx::Size GetSizeForNewRenderView( 645 virtual gfx::Size GetSizeForNewRenderView(
646 const content::WebContents* web_contents) const OVERRIDE; 646 const content::WebContents* web_contents) const OVERRIDE;
647 647
648 // Overridden from CoreTabHelperDelegate: 648 // Overridden from CoreTabHelperDelegate:
649 // Note that the caller is responsible for deleting |old_contents|. 649 // Note that the caller is responsible for deleting |old_contents|.
650 virtual void SwapTabContents(content::WebContents* old_contents, 650 virtual void SwapTabContents(content::WebContents* old_contents,
651 content::WebContents* new_contents) OVERRIDE; 651 content::WebContents* new_contents,
652 bool did_start_load,
653 bool did_finish_load) OVERRIDE;
652 virtual bool CanReloadContents( 654 virtual bool CanReloadContents(
653 content::WebContents* web_contents) const OVERRIDE; 655 content::WebContents* web_contents) const OVERRIDE;
654 virtual bool CanSaveContents( 656 virtual bool CanSaveContents(
655 content::WebContents* web_contents) const OVERRIDE; 657 content::WebContents* web_contents) const OVERRIDE;
656 658
657 // Overridden from SearchEngineTabHelperDelegate: 659 // Overridden from SearchEngineTabHelperDelegate:
658 virtual void ConfirmAddSearchProvider(TemplateURL* template_url, 660 virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
659 Profile* profile) OVERRIDE; 661 Profile* profile) OVERRIDE;
660 662
661 // Overridden from WebContentsModalDialogManagerDelegate: 663 // Overridden from WebContentsModalDialogManagerDelegate:
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 base::WeakPtrFactory<Browser> weak_factory_; 928 base::WeakPtrFactory<Browser> weak_factory_;
927 929
928 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; 930 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_;
929 931
930 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; 932 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_;
931 933
932 DISALLOW_COPY_AND_ASSIGN(Browser); 934 DISALLOW_COPY_AND_ASSIGN(Browser);
933 }; 935 };
934 936
935 #endif // CHROME_BROWSER_UI_BROWSER_H_ 937 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/sessions/session_restore_android.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698