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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 // Creates a new tab with the already-created TabContents 'new_contents'. | 421 // Creates a new tab with the already-created TabContents 'new_contents'. |
422 // The window for the added contents will be reparented correctly when this | 422 // The window for the added contents will be reparented correctly when this |
423 // method returns. If |disposition| is NEW_POPUP, |pos| should hold the | 423 // method returns. If |disposition| is NEW_POPUP, |pos| should hold the |
424 // initial position. | 424 // initial position. |
425 void AddTabContents(TabContents* new_contents, | 425 void AddTabContents(TabContents* new_contents, |
426 WindowOpenDisposition disposition, | 426 WindowOpenDisposition disposition, |
427 const gfx::Rect& initial_pos, | 427 const gfx::Rect& initial_pos, |
428 bool user_gesture); | 428 bool user_gesture); |
429 void CloseTabContents(TabContents* contents); | 429 void CloseTabContents(TabContents* contents); |
430 | 430 |
431 // Show a dialog with HTML content. |delegate| contains a pointer to the | 431 // Shows a dialog with HTML content and returns it. |delegate| contains a |
432 // delegate who knows how to display the dialog (which file URL and JSON | 432 // pointer to the delegate who knows how to display the dialog (which file |
433 // string input to use during initialization). |parent_window| is the window | 433 // URL and JSON string input to use during initialization). |parent_window| |
434 // that should be parent of the dialog, or NULL for the default. | 434 // is the window that should be parent of the dialog, or NULL for the default. |
435 void BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, | 435 gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, |
436 gfx::NativeWindow parent_window); | 436 gfx::NativeWindow parent_window); |
437 | 437 |
438 // Called when a popup select is about to be displayed. | 438 // Called when a popup select is about to be displayed. |
439 void BrowserRenderWidgetShowing(); | 439 void BrowserRenderWidgetShowing(); |
440 | 440 |
441 // Notification that the bookmark bar has changed size. We need to resize the | 441 // Notification that the bookmark bar has changed size. We need to resize the |
442 // content area and notify our InfoBarContainer. | 442 // content area and notify our InfoBarContainer. |
443 void BookmarkBarSizeChanged(bool is_animating); | 443 void BookmarkBarSizeChanged(bool is_animating); |
444 | 444 |
445 // Replaces the state of the currently selected tab with the session | 445 // Replaces the state of the currently selected tab with the session |
446 // history restored from the SessionRestore system. | 446 // history restored from the SessionRestore system. |
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1279 | 1279 |
1280 scoped_ptr<InstantController> instant_; | 1280 scoped_ptr<InstantController> instant_; |
1281 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1281 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
1282 | 1282 |
1283 BookmarkBar::State bookmark_bar_state_; | 1283 BookmarkBar::State bookmark_bar_state_; |
1284 | 1284 |
1285 DISALLOW_COPY_AND_ASSIGN(Browser); | 1285 DISALLOW_COPY_AND_ASSIGN(Browser); |
1286 }; | 1286 }; |
1287 | 1287 |
1288 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1288 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |