| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_VIEWS_FRAME_BROWSER_VIEW_H_ | 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 class BrowserBubble; | 40 class BrowserBubble; |
| 41 class BrowserExtender; | 41 class BrowserExtender; |
| 42 class BrowserViewLayout; | 42 class BrowserViewLayout; |
| 43 class DownloadShelfView; | 43 class DownloadShelfView; |
| 44 class EncodingMenuModel; | 44 class EncodingMenuModel; |
| 45 class ExtensionShelf; | 45 class ExtensionShelf; |
| 46 class FullscreenExitBubble; | 46 class FullscreenExitBubble; |
| 47 class HtmlDialogUIDelegate; | 47 class HtmlDialogUIDelegate; |
| 48 class InfoBarContainer; | 48 class InfoBarContainer; |
| 49 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
| 50 class AeroPeekManager; |
| 50 class JumpList; | 51 class JumpList; |
| 51 #endif | 52 #endif |
| 52 class LocationBarView; | 53 class LocationBarView; |
| 53 class SideTabStrip; | 54 class SideTabStrip; |
| 54 class StatusBubbleViews; | 55 class StatusBubbleViews; |
| 55 class TabContentsContainer; | 56 class TabContentsContainer; |
| 56 class ToolbarView; | 57 class ToolbarView; |
| 57 class ZoomMenuModel; | 58 class ZoomMenuModel; |
| 58 | 59 |
| 59 namespace views { | 60 namespace views { |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 // object is also passed as a tick handler with the ticker_ object. | 551 // object is also passed as a tick handler with the ticker_ object. |
| 551 // It is used to periodically monitor for hung plugin windows | 552 // It is used to periodically monitor for hung plugin windows |
| 552 HungWindowDetector hung_window_detector_; | 553 HungWindowDetector hung_window_detector_; |
| 553 | 554 |
| 554 // This object is invoked by hung_window_detector_ when it detects a hung | 555 // This object is invoked by hung_window_detector_ when it detects a hung |
| 555 // plugin window. | 556 // plugin window. |
| 556 HungPluginAction hung_plugin_action_; | 557 HungPluginAction hung_plugin_action_; |
| 557 | 558 |
| 558 // The custom JumpList for Windows 7. | 559 // The custom JumpList for Windows 7. |
| 559 scoped_ptr<JumpList> jumplist_; | 560 scoped_ptr<JumpList> jumplist_; |
| 561 |
| 562 // The custom AeroPeek manager for Windows 7. |
| 563 scoped_ptr<AeroPeekManager> aeropeek_manager_; |
| 560 #endif | 564 #endif |
| 561 | 565 |
| 562 // The timer used to update frames for the Loading Animation. | 566 // The timer used to update frames for the Loading Animation. |
| 563 base::RepeatingTimer<BrowserView> loading_animation_timer_; | 567 base::RepeatingTimer<BrowserView> loading_animation_timer_; |
| 564 | 568 |
| 565 // A bottom bar for showing extensions. | 569 // A bottom bar for showing extensions. |
| 566 ExtensionShelf* extension_shelf_; | 570 ExtensionShelf* extension_shelf_; |
| 567 | 571 |
| 568 // The accessible name of this view. | 572 // The accessible name of this view. |
| 569 std::wstring accessible_name_; | 573 std::wstring accessible_name_; |
| 570 | 574 |
| 571 scoped_ptr<BrowserExtender> browser_extender_; | 575 scoped_ptr<BrowserExtender> browser_extender_; |
| 572 | 576 |
| 573 // Last focused view that issued a tab traversal. | 577 // Last focused view that issued a tab traversal. |
| 574 int last_focused_view_storage_id_; | 578 int last_focused_view_storage_id_; |
| 575 | 579 |
| 576 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; | 580 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; |
| 577 | 581 |
| 578 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 582 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 579 }; | 583 }; |
| 580 | 584 |
| 581 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 585 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |