| 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_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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 class BookmarkBarView; | 43 class BookmarkBarView; |
| 44 class Browser; | 44 class Browser; |
| 45 class BrowserBubble; | 45 class BrowserBubble; |
| 46 class BrowserViewLayout; | 46 class BrowserViewLayout; |
| 47 class ContentsContainer; | 47 class ContentsContainer; |
| 48 class CompactLocationBar; | 48 class CompactLocationBar; |
| 49 class CompactNavigationBar; | 49 class CompactNavigationBar; |
| 50 class CompactOptionsBar; | 50 class CompactOptionsBar; |
| 51 class DownloadShelfView; | 51 class DownloadShelfView; |
| 52 class EncodingMenuModel; | 52 class EncodingMenuModel; |
| 53 class FullscreenExitBubble; | 53 class FullscreenExitBubbleViews; |
| 54 class HtmlDialogUIDelegate; | 54 class HtmlDialogUIDelegate; |
| 55 class InfoBarContainerView; | 55 class InfoBarContainerView; |
| 56 class LocationBarView; | 56 class LocationBarView; |
| 57 class SideTabStrip; | 57 class SideTabStrip; |
| 58 class StatusBubbleViews; | 58 class StatusBubbleViews; |
| 59 class TabContentsContainer; | 59 class TabContentsContainer; |
| 60 class TabStripModel; | 60 class TabStripModel; |
| 61 class ToolbarView; | 61 class ToolbarView; |
| 62 class ZoomMenuModel; | 62 class ZoomMenuModel; |
| 63 class Extension; | 63 class Extension; |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 683 // A mapping between accelerators and commands. | 683 // A mapping between accelerators and commands. |
| 684 std::map<views::Accelerator, int> accelerator_table_; | 684 std::map<views::Accelerator, int> accelerator_table_; |
| 685 | 685 |
| 686 // True if we have already been initialized. | 686 // True if we have already been initialized. |
| 687 bool initialized_; | 687 bool initialized_; |
| 688 | 688 |
| 689 // True if we should ignore requests to layout. This is set while toggling | 689 // True if we should ignore requests to layout. This is set while toggling |
| 690 // fullscreen mode on and off to reduce jankiness. | 690 // fullscreen mode on and off to reduce jankiness. |
| 691 bool ignore_layout_; | 691 bool ignore_layout_; |
| 692 | 692 |
| 693 scoped_ptr<FullscreenExitBubble> fullscreen_bubble_; | 693 scoped_ptr<FullscreenExitBubbleViews> fullscreen_bubble_; |
| 694 | 694 |
| 695 #if defined(OS_WIN) | 695 #if defined(OS_WIN) |
| 696 // The additional items we insert into the system menu. | 696 // The additional items we insert into the system menu. |
| 697 scoped_ptr<views::SystemMenuModel> system_menu_contents_; | 697 scoped_ptr<views::SystemMenuModel> system_menu_contents_; |
| 698 scoped_ptr<ZoomMenuModel> zoom_menu_contents_; | 698 scoped_ptr<ZoomMenuModel> zoom_menu_contents_; |
| 699 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; | 699 scoped_ptr<EncodingMenuModel> encoding_menu_contents_; |
| 700 // The wrapped system menu itself. | 700 // The wrapped system menu itself. |
| 701 scoped_ptr<views::NativeMenuWin> system_menu_; | 701 scoped_ptr<views::NativeMenuWin> system_menu_; |
| 702 | 702 |
| 703 // This object is used to perform periodic actions in a worker | 703 // This object is used to perform periodic actions in a worker |
| (...skipping 23 matching lines...) Expand all Loading... |
| 727 | 727 |
| 728 NotificationRegistrar registrar_; | 728 NotificationRegistrar registrar_; |
| 729 | 729 |
| 730 // Used to measure the loading spinner animation rate. | 730 // Used to measure the loading spinner animation rate. |
| 731 base::TimeTicks last_animation_time_; | 731 base::TimeTicks last_animation_time_; |
| 732 | 732 |
| 733 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 733 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
| 734 }; | 734 }; |
| 735 | 735 |
| 736 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 736 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
| OLD | NEW |