| 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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "chrome/browser/ui/browser_navigator.h" | 25 #include "chrome/browser/ui/browser_navigator.h" |
| 26 #include "chrome/browser/ui/browser_navigator_params.h" | 26 #include "chrome/browser/ui/browser_navigator_params.h" |
| 27 #include "chrome/browser/ui/chrome_bubble_manager.h" | 27 #include "chrome/browser/ui/chrome_bubble_manager.h" |
| 28 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" | 28 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" |
| 29 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" | 29 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
| 30 #include "chrome/browser/ui/profile_chooser_constants.h" | 30 #include "chrome/browser/ui/profile_chooser_constants.h" |
| 31 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 31 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 32 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 32 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 33 #include "components/content_settings/core/common/content_settings.h" | 33 #include "components/content_settings/core/common/content_settings.h" |
| 34 #include "components/content_settings/core/common/content_settings_types.h" | 34 #include "components/content_settings/core/common/content_settings_types.h" |
| 35 #include "components/keyboard_lock/keyboard_lock_host.h" |
| 35 #include "components/prefs/pref_change_registrar.h" | 36 #include "components/prefs/pref_change_registrar.h" |
| 36 #include "components/sessions/core/session_id.h" | 37 #include "components/sessions/core/session_id.h" |
| 37 #include "components/toolbar/toolbar_model.h" | 38 #include "components/toolbar/toolbar_model.h" |
| 38 #include "components/translate/content/browser/content_translate_driver.h" | 39 #include "components/translate/content/browser/content_translate_driver.h" |
| 39 #include "content/public/browser/notification_observer.h" | 40 #include "content/public/browser/notification_observer.h" |
| 40 #include "content/public/browser/notification_registrar.h" | 41 #include "content/public/browser/notification_registrar.h" |
| 41 #include "content/public/browser/page_navigator.h" | 42 #include "content/public/browser/page_navigator.h" |
| 42 #include "content/public/browser/web_contents.h" | 43 #include "content/public/browser/web_contents.h" |
| 43 #include "content/public/browser/web_contents_delegate.h" | 44 #include "content/public/browser/web_contents_delegate.h" |
| 44 #include "content/public/common/page_zoom.h" | 45 #include "content/public/common/page_zoom.h" |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 return exclusive_access_manager_.get(); | 525 return exclusive_access_manager_.get(); |
| 525 } | 526 } |
| 526 | 527 |
| 527 extensions::WindowController* extension_window_controller() const { | 528 extensions::WindowController* extension_window_controller() const { |
| 528 return extension_window_controller_.get(); | 529 return extension_window_controller_.get(); |
| 529 } | 530 } |
| 530 | 531 |
| 531 bool ShouldRunUnloadListenerBeforeClosing(content::WebContents* web_contents); | 532 bool ShouldRunUnloadListenerBeforeClosing(content::WebContents* web_contents); |
| 532 bool RunUnloadListenerBeforeClosing(content::WebContents* web_contents); | 533 bool RunUnloadListenerBeforeClosing(content::WebContents* web_contents); |
| 533 | 534 |
| 535 keyboard_lock::KeyboardLockHost* GetKeyboardLockHost() const { |
| 536 return keyboard_lock_host_.get(); |
| 537 } |
| 538 |
| 534 private: | 539 private: |
| 535 friend class BrowserTest; | 540 friend class BrowserTest; |
| 536 friend class FullscreenControllerInteractiveTest; | 541 friend class FullscreenControllerInteractiveTest; |
| 537 friend class FullscreenControllerTest; | 542 friend class FullscreenControllerTest; |
| 538 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); | 543 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
| 539 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, | 544 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, |
| 540 IsReservedCommandOrKeyIsApp); | 545 IsReservedCommandOrKeyIsApp); |
| 541 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); | 546 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); |
| 542 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 547 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
| 543 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 548 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1012 bool window_has_shown_; | 1017 bool window_has_shown_; |
| 1013 | 1018 |
| 1014 base::WeakPtr<ValidationMessageBubble> validation_message_bubble_; | 1019 base::WeakPtr<ValidationMessageBubble> validation_message_bubble_; |
| 1015 | 1020 |
| 1016 #if !defined(OS_CHROMEOS) | 1021 #if !defined(OS_CHROMEOS) |
| 1017 SigninViewController signin_view_controller_; | 1022 SigninViewController signin_view_controller_; |
| 1018 #endif | 1023 #endif |
| 1019 | 1024 |
| 1020 std::unique_ptr<ScopedKeepAlive> keep_alive_; | 1025 std::unique_ptr<ScopedKeepAlive> keep_alive_; |
| 1021 | 1026 |
| 1027 const std::unique_ptr<keyboard_lock::KeyboardLockHost> keyboard_lock_host_; |
| 1028 |
| 1022 // The following factory is used for chrome update coalescing. | 1029 // The following factory is used for chrome update coalescing. |
| 1023 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1030 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1024 | 1031 |
| 1025 // The following factory is used to close the frame at a later time. | 1032 // The following factory is used to close the frame at a later time. |
| 1026 base::WeakPtrFactory<Browser> weak_factory_; | 1033 base::WeakPtrFactory<Browser> weak_factory_; |
| 1027 | 1034 |
| 1028 DISALLOW_COPY_AND_ASSIGN(Browser); | 1035 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1029 }; | 1036 }; |
| 1030 | 1037 |
| 1031 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1038 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |