| OLD | NEW |
| 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_TABSTRIP_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_ |
| 7 | 7 |
| 8 #include "content/public/common/page_transition_types.h" | 8 #include "content/public/common/page_transition_types.h" |
| 9 #include "content/public/browser/navigation_controller.h" | 9 #include "content/public/browser/navigation_controller.h" |
| 10 #include "webkit/glue/window_open_disposition.h" | 10 #include "webkit/glue/window_open_disposition.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 content::PageTransition transition); | 48 content::PageTransition transition); |
| 49 | 49 |
| 50 // Adds |tab_contents| to |browser|'s tabstrip. | 50 // Adds |tab_contents| to |browser|'s tabstrip. |
| 51 void AddTab(Browser* browser, | 51 void AddTab(Browser* browser, |
| 52 TabContents* tab_contents, | 52 TabContents* tab_contents, |
| 53 content::PageTransition type); | 53 content::PageTransition type); |
| 54 | 54 |
| 55 // Creates a new tab with the already-created WebContents 'new_contents'. | 55 // Creates a new tab with the already-created WebContents 'new_contents'. |
| 56 // The window for the added contents will be reparented correctly when this | 56 // The window for the added contents will be reparented correctly when this |
| 57 // method returns. If |disposition| is NEW_POPUP, |pos| should hold the | 57 // method returns. If |disposition| is NEW_POPUP, |pos| should hold the |
| 58 // initial position. | 58 // initial position. If |was_blocked| is non-NULL, then |*was_blocked| will be |
| 59 // set to true if the popup gets blocked, and left unchanged otherwise. |
| 59 void AddWebContents(Browser* browser, | 60 void AddWebContents(Browser* browser, |
| 60 content::WebContents* source_contents, | 61 content::WebContents* source_contents, |
| 61 content::WebContents* new_contents, | 62 content::WebContents* new_contents, |
| 62 WindowOpenDisposition disposition, | 63 WindowOpenDisposition disposition, |
| 63 const gfx::Rect& initial_pos, | 64 const gfx::Rect& initial_pos, |
| 64 bool user_gesture); | 65 bool user_gesture, |
| 66 bool* was__blocked); |
| 65 void CloseWebContents(Browser* browser, content::WebContents* contents); | 67 void CloseWebContents(Browser* browser, content::WebContents* contents); |
| 66 | 68 |
| 67 void CloseAllTabs(Browser* browser); | 69 void CloseAllTabs(Browser* browser); |
| 68 | 70 |
| 69 // Centralized methods for creating a TabContents, configuring and | 71 // Centralized methods for creating a TabContents, configuring and |
| 70 // installing all its supporting objects and observers. | 72 // installing all its supporting objects and observers. |
| 71 TabContents* TabContentsFactory( | 73 TabContents* TabContentsFactory( |
| 72 Profile* profile, | 74 Profile* profile, |
| 73 content::SiteInstance* site_instance, | 75 content::SiteInstance* site_instance, |
| 74 int routing_id, | 76 int routing_id, |
| (...skipping 10 matching lines...) Expand all Loading... |
| 85 TabContents* TabContentsWithSessionStorageFactory( | 87 TabContents* TabContentsWithSessionStorageFactory( |
| 86 Profile* profile, | 88 Profile* profile, |
| 87 content::SiteInstance* site_instance, | 89 content::SiteInstance* site_instance, |
| 88 int routing_id, | 90 int routing_id, |
| 89 const content::WebContents* base_web_contents, | 91 const content::WebContents* base_web_contents, |
| 90 const content::SessionStorageNamespaceMap& session_storage_namespace_map); | 92 const content::SessionStorageNamespaceMap& session_storage_namespace_map); |
| 91 | 93 |
| 92 } // namespace chrome | 94 } // namespace chrome |
| 93 | 95 |
| 94 #endif // CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_ | 96 #endif // CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_ |
| OLD | NEW |