OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 bool from_last_session, | 441 bool from_last_session, |
442 SessionStorageNamespace* storage_namespace); | 442 SessionStorageNamespace* storage_namespace); |
443 // Creates a new tab with the already-created WebContents 'new_contents'. | 443 // Creates a new tab with the already-created WebContents 'new_contents'. |
444 // The window for the added contents will be reparented correctly when this | 444 // The window for the added contents will be reparented correctly when this |
445 // method returns. If |disposition| is NEW_POPUP, |pos| should hold the | 445 // method returns. If |disposition| is NEW_POPUP, |pos| should hold the |
446 // initial position. | 446 // initial position. |
447 void AddWebContents(content::WebContents* new_contents, | 447 void AddWebContents(content::WebContents* new_contents, |
448 WindowOpenDisposition disposition, | 448 WindowOpenDisposition disposition, |
449 const gfx::Rect& initial_pos, | 449 const gfx::Rect& initial_pos, |
450 bool user_gesture); | 450 bool user_gesture); |
451 void CloseTabContents(TabContents* contents); | 451 void CloseTabContents(content::WebContents* contents); |
452 | 452 |
453 // Shows a dialog with HTML content and returns it. |delegate| contains a | 453 // Shows a dialog with HTML content and returns it. |delegate| contains a |
454 // pointer to the delegate who knows how to display the dialog (which file | 454 // pointer to the delegate who knows how to display the dialog (which file |
455 // URL and JSON string input to use during initialization). |parent_window| | 455 // URL and JSON string input to use during initialization). |parent_window| |
456 // is the window that should be parent of the dialog, or NULL for the default. | 456 // is the window that should be parent of the dialog, or NULL for the default. |
457 // |style| customizes this HTML dialog decoration and layout (X button, | 457 // |style| customizes this HTML dialog decoration and layout (X button, |
458 // throbber, default content padding). Except ChromeOS, other platforms | 458 // throbber, default content padding). Except ChromeOS, other platforms |
459 // only have STYLE_GENERIC now. | 459 // only have STYLE_GENERIC now. |
460 // TODO(bshe): Implementing styles not related to window decoration in other | 460 // TODO(bshe): Implementing styles not related to window decoration in other |
461 // platforms for consistency if necessary. | 461 // platforms for consistency if necessary. |
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1422 | 1422 |
1423 scoped_refptr<FullscreenController> fullscreen_controller_; | 1423 scoped_refptr<FullscreenController> fullscreen_controller_; |
1424 | 1424 |
1425 // True if the browser window has been shown at least once. | 1425 // True if the browser window has been shown at least once. |
1426 bool window_has_shown_; | 1426 bool window_has_shown_; |
1427 | 1427 |
1428 DISALLOW_COPY_AND_ASSIGN(Browser); | 1428 DISALLOW_COPY_AND_ASSIGN(Browser); |
1429 }; | 1429 }; |
1430 | 1430 |
1431 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1431 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |