Chromium Code Reviews| 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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 430 void AddTabContents(TabContents* new_contents, | 430 void AddTabContents(TabContents* new_contents, |
| 431 WindowOpenDisposition disposition, | 431 WindowOpenDisposition disposition, |
| 432 const gfx::Rect& initial_pos, | 432 const gfx::Rect& initial_pos, |
| 433 bool user_gesture); | 433 bool user_gesture); |
| 434 void CloseTabContents(TabContents* contents); | 434 void CloseTabContents(TabContents* contents); |
| 435 | 435 |
| 436 // Show a dialog with HTML content. |delegate| contains a pointer to the | 436 // Show a dialog with HTML content. |delegate| contains a pointer to the |
| 437 // delegate who knows how to display the dialog (which file URL and JSON | 437 // delegate who knows how to display the dialog (which file URL and JSON |
| 438 // string input to use during initialization). |parent_window| is the window | 438 // string input to use during initialization). |parent_window| is the window |
| 439 // that should be parent of the dialog, or NULL for the default. | 439 // that should be parent of the dialog, or NULL for the default. |
| 440 void BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, | 440 gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, |
|
xiyuan
2011/08/11 16:36:47
nit: Update comments above for the return value?
yoshiki
2011/08/16 02:13:30
Done.
| |
| 441 gfx::NativeWindow parent_window); | 441 gfx::NativeWindow parent_window); |
| 442 | 442 |
| 443 // Called when a popup select is about to be displayed. | 443 // Called when a popup select is about to be displayed. |
| 444 void BrowserRenderWidgetShowing(); | 444 void BrowserRenderWidgetShowing(); |
| 445 | 445 |
| 446 // Notification that the bookmark bar has changed size. We need to resize the | 446 // Notification that the bookmark bar has changed size. We need to resize the |
| 447 // content area and notify our InfoBarContainer. | 447 // content area and notify our InfoBarContainer. |
| 448 void BookmarkBarSizeChanged(bool is_animating); | 448 void BookmarkBarSizeChanged(bool is_animating); |
| 449 | 449 |
| 450 // Replaces the state of the currently selected tab with the session | 450 // Replaces the state of the currently selected tab with the session |
| 451 // history restored from the SessionRestore system. | 451 // history restored from the SessionRestore system. |
| (...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1284 | 1284 |
| 1285 scoped_ptr<InstantController> instant_; | 1285 scoped_ptr<InstantController> instant_; |
| 1286 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1286 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1287 | 1287 |
| 1288 BookmarkBar::State bookmark_bar_state_; | 1288 BookmarkBar::State bookmark_bar_state_; |
| 1289 | 1289 |
| 1290 DISALLOW_COPY_AND_ASSIGN(Browser); | 1290 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1291 }; | 1291 }; |
| 1292 | 1292 |
| 1293 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1293 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |