| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 class LocationBarView; | 55 class LocationBarView; |
| 56 class SideTabStrip; | 56 class SideTabStrip; |
| 57 class StatusBubbleViews; | 57 class StatusBubbleViews; |
| 58 class TabContentsContainer; | 58 class TabContentsContainer; |
| 59 class ToolbarView; | 59 class ToolbarView; |
| 60 class ZoomMenuModel; | 60 class ZoomMenuModel; |
| 61 | 61 |
| 62 #if defined(OS_WIN) | 62 #if defined(OS_WIN) |
| 63 class AeroPeekManager; | 63 class AeroPeekManager; |
| 64 class JumpList; | 64 class JumpList; |
| 65 #elif defined(OS_LINUX) | |
| 66 class AccessibleWidgetHelper; | |
| 67 #endif | 65 #endif |
| 68 | 66 |
| 69 namespace views { | 67 namespace views { |
| 70 class ExternalFocusTracker; | 68 class ExternalFocusTracker; |
| 71 class Menu; | 69 class Menu; |
| 72 class SingleSplitView; | 70 class SingleSplitView; |
| 73 } | 71 } |
| 74 | 72 |
| 75 /////////////////////////////////////////////////////////////////////////////// | 73 /////////////////////////////////////////////////////////////////////////////// |
| 76 // BrowserView | 74 // BrowserView |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 base::RepeatingTimer<BrowserView> loading_animation_timer_; | 600 base::RepeatingTimer<BrowserView> loading_animation_timer_; |
| 603 | 601 |
| 604 // A bottom bar for showing extensions. | 602 // A bottom bar for showing extensions. |
| 605 ExtensionShelf* extension_shelf_; | 603 ExtensionShelf* extension_shelf_; |
| 606 | 604 |
| 607 scoped_ptr<BrowserExtender> browser_extender_; | 605 scoped_ptr<BrowserExtender> browser_extender_; |
| 608 | 606 |
| 609 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; | 607 UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; |
| 610 | 608 |
| 611 scoped_ptr<AccessibleViewHelper> accessible_view_helper_; | 609 scoped_ptr<AccessibleViewHelper> accessible_view_helper_; |
| 612 #if defined(OS_LINUX) | |
| 613 scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_; | |
| 614 #endif | |
| 615 | 610 |
| 616 // Loads extension_app_icon_ asynchronously on the file thread. | 611 // Loads extension_app_icon_ asynchronously on the file thread. |
| 617 ImageLoadingTracker extension_app_icon_loader_; | 612 ImageLoadingTracker extension_app_icon_loader_; |
| 618 | 613 |
| 619 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 614 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 620 }; | 615 }; |
| 621 | 616 |
| 622 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ | 617 #endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |