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 16 matching lines...) Expand all Loading... |
27 #include "chrome/browser/sessions/tab_restore_service_observer.h" | 27 #include "chrome/browser/sessions/tab_restore_service_observer.h" |
28 #include "chrome/browser/sync/profile_sync_service_observer.h" | 28 #include "chrome/browser/sync/profile_sync_service_observer.h" |
29 #include "chrome/browser/tabs/tab_handler.h" | 29 #include "chrome/browser/tabs/tab_handler.h" |
30 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove | 30 #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove |
31 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove | 31 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove |
32 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" | 32 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" |
33 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 33 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
34 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" | 34 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |
35 #include "chrome/browser/ui/browser_navigator.h" | 35 #include "chrome/browser/ui/browser_navigator.h" |
36 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" | 36 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" |
| 37 #include "chrome/browser/ui/dialog_style.h" |
37 #include "chrome/browser/ui/fullscreen_controller.h" | 38 #include "chrome/browser/ui/fullscreen_controller.h" |
38 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" | 39 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" |
39 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 40 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
40 #include "chrome/browser/ui/select_file_dialog.h" | 41 #include "chrome/browser/ui/select_file_dialog.h" |
41 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" | 42 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" |
42 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 43 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
43 #include "chrome/common/content_settings.h" | 44 #include "chrome/common/content_settings.h" |
44 #include "chrome/common/content_settings_types.h" | 45 #include "chrome/common/content_settings_types.h" |
45 #include "chrome/common/extensions/extension_constants.h" | 46 #include "chrome/common/extensions/extension_constants.h" |
46 #include "content/browser/tab_contents/page_navigator.h" | 47 #include "content/browser/tab_contents/page_navigator.h" |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 WindowOpenDisposition disposition, | 454 WindowOpenDisposition disposition, |
454 const gfx::Rect& initial_pos, | 455 const gfx::Rect& initial_pos, |
455 bool user_gesture); | 456 bool user_gesture); |
456 void CloseTabContents(TabContents* contents); | 457 void CloseTabContents(TabContents* contents); |
457 | 458 |
458 // Shows a dialog with HTML content and returns it. |delegate| contains a | 459 // Shows a dialog with HTML content and returns it. |delegate| contains a |
459 // pointer to the delegate who knows how to display the dialog (which file | 460 // pointer to the delegate who knows how to display the dialog (which file |
460 // URL and JSON string input to use during initialization). |parent_window| | 461 // URL and JSON string input to use during initialization). |parent_window| |
461 // is the window that should be parent of the dialog, or NULL for the default. | 462 // is the window that should be parent of the dialog, or NULL for the default. |
462 gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, | 463 gfx::NativeWindow BrowserShowHtmlDialog(HtmlDialogUIDelegate* delegate, |
463 gfx::NativeWindow parent_window); | 464 gfx::NativeWindow parent_window, |
| 465 DialogStyle style); |
464 | 466 |
465 // Called when a popup select is about to be displayed. | 467 // Called when a popup select is about to be displayed. |
466 void BrowserRenderWidgetShowing(); | 468 void BrowserRenderWidgetShowing(); |
467 | 469 |
468 // Notification that the bookmark bar has changed size. We need to resize the | 470 // Notification that the bookmark bar has changed size. We need to resize the |
469 // content area and notify our InfoBarContainer. | 471 // content area and notify our InfoBarContainer. |
470 void BookmarkBarSizeChanged(bool is_animating); | 472 void BookmarkBarSizeChanged(bool is_animating); |
471 | 473 |
472 // Replaces the state of the currently selected tab with the session | 474 // Replaces the state of the currently selected tab with the session |
473 // history restored from the SessionRestore system. | 475 // history restored from the SessionRestore system. |
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1425 | 1427 |
1426 scoped_refptr<FullscreenController> fullscreen_controller_; | 1428 scoped_refptr<FullscreenController> fullscreen_controller_; |
1427 | 1429 |
1428 // True if the browser window has been shown at least once. | 1430 // True if the browser window has been shown at least once. |
1429 bool window_has_shown_; | 1431 bool window_has_shown_; |
1430 | 1432 |
1431 DISALLOW_COPY_AND_ASSIGN(Browser); | 1433 DISALLOW_COPY_AND_ASSIGN(Browser); |
1432 }; | 1434 }; |
1433 | 1435 |
1434 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1436 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |