Chromium Code Reviews| 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_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 class InfoBarContainerView; | 48 class InfoBarContainerView; |
| 49 class InstantPreviewControllerViews; | 49 class InstantPreviewControllerViews; |
| 50 class LocationBarView; | 50 class LocationBarView; |
| 51 class StatusBubbleViews; | 51 class StatusBubbleViews; |
| 52 class SearchViewController; | 52 class SearchViewController; |
| 53 class TabStrip; | 53 class TabStrip; |
| 54 class TabStripModel; | 54 class TabStripModel; |
| 55 class ToolbarView; | 55 class ToolbarView; |
| 56 | 56 |
| 57 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
| 58 class JumpListListener; | |
| 58 class JumpList; | 59 class JumpList; |
| 59 #endif | 60 #endif |
| 60 | 61 |
| 61 #if defined(USE_ASH) | 62 #if defined(USE_ASH) |
| 62 class BrowserLauncherItemController; | 63 class BrowserLauncherItemController; |
| 63 #endif | 64 #endif |
| 64 | 65 |
| 65 namespace autofill { | 66 namespace autofill { |
| 66 class PasswordGenerator; | 67 class PasswordGenerator; |
| 67 } | 68 } |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 563 // and returns true if the focus is currently on a WebContent. | 564 // and returns true if the focus is currently on a WebContent. |
| 564 bool DoCutCopyPaste(void (content::RenderWidgetHost::*method)()); | 565 bool DoCutCopyPaste(void (content::RenderWidgetHost::*method)()); |
| 565 | 566 |
| 566 // Shows the next app-modal dialog box, if there is one to be shown, or moves | 567 // Shows the next app-modal dialog box, if there is one to be shown, or moves |
| 567 // an existing showing one to the front. | 568 // an existing showing one to the front. |
| 568 void ActivateAppModalDialog() const; | 569 void ActivateAppModalDialog() const; |
| 569 | 570 |
| 570 // If search mode is |MODE_NTP| and bookmark bar is visible, stack it at top. | 571 // If search mode is |MODE_NTP| and bookmark bar is visible, stack it at top. |
| 571 void MaybeStackBookmarkBarAtTop(); | 572 void MaybeStackBookmarkBarAtTop(); |
| 572 | 573 |
| 574 #if defined(OS_WIN) | |
|
sky
2012/12/18 20:52:38
and !aura
Cait (Slow)
2012/12/19 19:27:01
Done.
| |
| 575 // Creates and initializes the |jumplist_|. | |
| 576 void CreateJumpList(); | |
| 577 #endif | |
| 578 | |
| 573 // Last focused view that issued a tab traversal. | 579 // Last focused view that issued a tab traversal. |
| 574 int last_focused_view_storage_id_; | 580 int last_focused_view_storage_id_; |
| 575 | 581 |
| 576 // The BrowserFrame that hosts this view. | 582 // The BrowserFrame that hosts this view. |
| 577 BrowserFrame* frame_; | 583 BrowserFrame* frame_; |
| 578 | 584 |
| 579 // The Browser object we are associated with. | 585 // The Browser object we are associated with. |
| 580 scoped_ptr<Browser> browser_; | 586 scoped_ptr<Browser> browser_; |
| 581 | 587 |
| 582 // BrowserView layout (LTR one is pictured here). | 588 // BrowserView layout (LTR one is pictured here). |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 689 | 695 |
| 690 // This object is initialized with the frame window HWND. This | 696 // This object is initialized with the frame window HWND. This |
| 691 // object is also passed as a tick handler with the ticker_ object. | 697 // object is also passed as a tick handler with the ticker_ object. |
| 692 // It is used to periodically monitor for hung plugin windows | 698 // It is used to periodically monitor for hung plugin windows |
| 693 HungWindowDetector hung_window_detector_; | 699 HungWindowDetector hung_window_detector_; |
| 694 | 700 |
| 695 // This object is invoked by hung_window_detector_ when it detects a hung | 701 // This object is invoked by hung_window_detector_ when it detects a hung |
| 696 // plugin window. | 702 // plugin window. |
| 697 HungPluginAction hung_plugin_action_; | 703 HungPluginAction hung_plugin_action_; |
| 698 | 704 |
| 705 // Helper class to ensure jumplist is not constructed until start-up is | |
| 706 // complete. | |
| 707 scoped_ptr<JumpListListener> jumplist_listener_; | |
| 708 | |
| 699 // The custom JumpList for Windows 7. | 709 // The custom JumpList for Windows 7. |
| 700 scoped_refptr<JumpList> jumplist_; | 710 scoped_refptr<JumpList> jumplist_; |
| 711 | |
| 701 #endif | 712 #endif |
| 702 | 713 |
| 703 #if defined(USE_ASH) | 714 #if defined(USE_ASH) |
| 704 scoped_ptr<BrowserLauncherItemController> launcher_item_controller_; | 715 scoped_ptr<BrowserLauncherItemController> launcher_item_controller_; |
| 705 #endif | 716 #endif |
| 706 | 717 |
| 707 // The timer used to update frames for the Loading Animation. | 718 // The timer used to update frames for the Loading Animation. |
| 708 base::RepeatingTimer<BrowserView> loading_animation_timer_; | 719 base::RepeatingTimer<BrowserView> loading_animation_timer_; |
| 709 | 720 |
| 710 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; | 721 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 723 gfx::ScopedSysColorChangeListener color_change_listener_; | 734 gfx::ScopedSysColorChangeListener color_change_listener_; |
| 724 | 735 |
| 725 scoped_ptr<InstantPreviewControllerViews> preview_controller_; | 736 scoped_ptr<InstantPreviewControllerViews> preview_controller_; |
| 726 | 737 |
| 727 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 738 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
| 728 | 739 |
| 729 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 740 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 730 }; | 741 }; |
| 731 | 742 |
| 732 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 743 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |