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 <memory> | 9 #include <memory> |
10 #include <string> | 10 #include <string> |
(...skipping 14 matching lines...) Expand all Loading... | |
25 #include "chrome/browser/ui/infobar_container_delegate.h" | 25 #include "chrome/browser/ui/infobar_container_delegate.h" |
26 #include "chrome/browser/ui/signin_view_controller.h" | 26 #include "chrome/browser/ui/signin_view_controller.h" |
27 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 27 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
28 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" | 28 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h" |
29 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h" | 29 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views .h" |
30 #include "chrome/browser/ui/views/frame/browser_frame.h" | 30 #include "chrome/browser/ui/views/frame/browser_frame.h" |
31 #include "chrome/browser/ui/views/frame/contents_web_view.h" | 31 #include "chrome/browser/ui/views/frame/contents_web_view.h" |
32 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 32 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
33 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" | 33 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" |
34 #include "chrome/browser/ui/views/load_complete_listener.h" | 34 #include "chrome/browser/ui/views/load_complete_listener.h" |
35 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" | |
35 #include "chrome/common/features.h" | 36 #include "chrome/common/features.h" |
36 #include "components/omnibox/browser/omnibox_popup_model_observer.h" | 37 #include "components/omnibox/browser/omnibox_popup_model_observer.h" |
37 #include "ui/base/accelerators/accelerator.h" | 38 #include "ui/base/accelerators/accelerator.h" |
38 #include "ui/base/models/simple_menu_model.h" | 39 #include "ui/base/models/simple_menu_model.h" |
39 #include "ui/gfx/native_widget_types.h" | 40 #include "ui/gfx/native_widget_types.h" |
40 #include "ui/views/controls/button/button.h" | 41 #include "ui/views/controls/button/button.h" |
41 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" | 42 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h" |
42 #include "ui/views/widget/widget_delegate.h" | 43 #include "ui/views/widget/widget_delegate.h" |
43 #include "ui/views/widget/widget_observer.h" | 44 #include "ui/views/widget/widget_observer.h" |
44 #include "ui/views/window/client_view.h" | 45 #include "ui/views/window/client_view.h" |
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
464 | 465 |
465 // extension::ExtensionKeybindingRegistry::Delegate overrides | 466 // extension::ExtensionKeybindingRegistry::Delegate overrides |
466 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() | 467 extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter() |
467 override; | 468 override; |
468 | 469 |
469 // Testing interface: | 470 // Testing interface: |
470 views::View* GetContentsContainerForTest() { return contents_container_; } | 471 views::View* GetContentsContainerForTest() { return contents_container_; } |
471 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } | 472 views::WebView* GetContentsWebViewForTest() { return contents_web_view_; } |
472 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; } | 473 views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; } |
473 | 474 |
475 // Creates an accessible tab label for screen readers that includes the tab | |
sky
2016/12/12 17:25:09
Please move this above testing interface functions
edwardjung
2016/12/12 19:16:20
Done.
| |
476 // status. This takes the form of "Page title - Tab state". | |
477 base::string16 GetAccessibleTabLabel(bool include_app_name, | |
478 TabRendererData data) const; | |
sky
2016/12/12 17:25:08
const TabRendererData&
edwardjung
2016/12/12 19:16:20
Done.
| |
479 | |
474 private: | 480 private: |
475 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate | 481 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate |
476 // interface to keep these two classes decoupled and testable. | 482 // interface to keep these two classes decoupled and testable. |
477 friend class BrowserViewLayoutDelegateImpl; | 483 friend class BrowserViewLayoutDelegateImpl; |
478 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView); | 484 FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView); |
479 | 485 |
480 // Appends to |toolbars| a pointer to each AccessiblePaneView that | 486 // Appends to |toolbars| a pointer to each AccessiblePaneView that |
481 // can be traversed using F6, in the order they should be traversed. | 487 // can be traversed using F6, in the order they should be traversed. |
482 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); | 488 void GetAccessiblePanes(std::vector<views::AccessiblePaneView*>* panes); |
483 | 489 |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
703 // The class that registers for keyboard shortcuts for extension commands. | 709 // The class that registers for keyboard shortcuts for extension commands. |
704 std::unique_ptr<ExtensionKeybindingRegistryViews> | 710 std::unique_ptr<ExtensionKeybindingRegistryViews> |
705 extension_keybinding_registry_; | 711 extension_keybinding_registry_; |
706 | 712 |
707 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; | 713 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; |
708 | 714 |
709 DISALLOW_COPY_AND_ASSIGN(BrowserView); | 715 DISALLOW_COPY_AND_ASSIGN(BrowserView); |
710 }; | 716 }; |
711 | 717 |
712 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ | 718 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ |
OLD | NEW |