diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 22:53:30 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 22:53:30 +0000 |
commit | ec322ff6c39bf30e9b3c1eb878a95507029c6002 (patch) | |
tree | 186cb72db581cab4643182d47f040b65b1addb46 /chrome/browser/navigation_controller.h | |
parent | f3f568b18078fa29f9b84cd66bd2d1029ce408a1 (diff) | |
download | chromium_src-ec322ff6c39bf30e9b3c1eb878a95507029c6002.zip chromium_src-ec322ff6c39bf30e9b3c1eb878a95507029c6002.tar.gz chromium_src-ec322ff6c39bf30e9b3c1eb878a95507029c6002.tar.bz2 |
Re-land this change: http://codereview.chromium.org/10967/show
Now with two improvements:
- no longer create WebContentsViews as WS_VISIBLE, to prevent them from showing up in the taskbar
- make sure overridden CreateView in NativeUIContents and StatusView have the correct signature.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller.h')
-rw-r--r-- | chrome/browser/navigation_controller.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h index cd156b5..74e3049 100644 --- a/chrome/browser/navigation_controller.h +++ b/chrome/browser/navigation_controller.h @@ -128,8 +128,7 @@ class NavigationController { NavigationController( Profile* profile, const std::vector<TabNavigation>& navigations, - int selected_navigation, - HWND parent); + int selected_navigation); ~NavigationController(); // Begin the destruction sequence for this NavigationController and all its @@ -141,8 +140,8 @@ class NavigationController { void Destroy(); // Clone the receiving navigation controller. Only the active tab contents is - // duplicated. It is created as a child of the provided HWND. - NavigationController* Clone(HWND hwnd); + // duplicated. + NavigationController* Clone(); // Returns the profile for this controller. It can never be NULL. Profile* profile() const { @@ -434,8 +433,7 @@ class NavigationController { // Returns the TabContents for the |entry|'s type. If the TabContents // doesn't yet exist, it is created. If a new TabContents is created, its // parent is |parent|. Becomes part of |entry|'s SiteInstance. - TabContents* GetTabContentsCreateIfNecessary(HWND parent, - const NavigationEntry& entry); + TabContents* GetTabContentsCreateIfNecessary(const NavigationEntry& entry); // Register the provided tab contents. This tab contents will be owned // and deleted by this navigation controller @@ -463,7 +461,7 @@ class NavigationController { // Invoked after session/tab restore or cloning a tab. Resets the transition // type of the entries, updates the max page id and creates the active // contents. - void FinishRestore(HWND parent_hwnd, int selected_index); + void FinishRestore(int selected_index); // Inserts an entry after the current position, removing all entries after it. // The new entry will become the active one. |