| 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 "components/zoom/zoom_observer.h" | 40 #include "components/zoom/zoom_observer.h" |
| 40 #include "content/public/browser/notification_observer.h" | 41 #include "content/public/browser/notification_observer.h" |
| 41 #include "content/public/browser/notification_registrar.h" | 42 #include "content/public/browser/notification_registrar.h" |
| 42 #include "content/public/browser/page_navigator.h" | 43 #include "content/public/browser/page_navigator.h" |
| 43 #include "content/public/browser/web_contents.h" | 44 #include "content/public/browser/web_contents.h" |
| 44 #include "content/public/browser/web_contents_delegate.h" | 45 #include "content/public/browser/web_contents_delegate.h" |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 return exclusive_access_manager_.get(); | 520 return exclusive_access_manager_.get(); |
| 520 } | 521 } |
| 521 | 522 |
| 522 extensions::WindowController* extension_window_controller() const { | 523 extensions::WindowController* extension_window_controller() const { |
| 523 return extension_window_controller_.get(); | 524 return extension_window_controller_.get(); |
| 524 } | 525 } |
| 525 | 526 |
| 526 bool ShouldRunUnloadListenerBeforeClosing(content::WebContents* web_contents); | 527 bool ShouldRunUnloadListenerBeforeClosing(content::WebContents* web_contents); |
| 527 bool RunUnloadListenerBeforeClosing(content::WebContents* web_contents); | 528 bool RunUnloadListenerBeforeClosing(content::WebContents* web_contents); |
| 528 | 529 |
| 530 keyboard_lock::KeyboardLockHost* GetKeyboardLockHost() const { |
| 531 return keyboard_lock_host_.get(); |
| 532 } |
| 533 |
| 529 private: | 534 private: |
| 530 friend class BrowserTest; | 535 friend class BrowserTest; |
| 531 friend class FullscreenControllerInteractiveTest; | 536 friend class FullscreenControllerInteractiveTest; |
| 532 friend class FullscreenControllerTest; | 537 friend class FullscreenControllerTest; |
| 533 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); | 538 FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest); |
| 534 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, | 539 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, |
| 535 IsReservedCommandOrKeyIsApp); | 540 IsReservedCommandOrKeyIsApp); |
| 536 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); | 541 FRIEND_TEST_ALL_PREFIXES(BrowserCommandControllerTest, AppFullScreen); |
| 537 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); | 542 FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups); |
| 538 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); | 543 FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut); |
| (...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 999 bool window_has_shown_; | 1004 bool window_has_shown_; |
| 1000 | 1005 |
| 1001 base::WeakPtr<ValidationMessageBubble> validation_message_bubble_; | 1006 base::WeakPtr<ValidationMessageBubble> validation_message_bubble_; |
| 1002 | 1007 |
| 1003 #if !defined(OS_CHROMEOS) | 1008 #if !defined(OS_CHROMEOS) |
| 1004 SigninViewController signin_view_controller_; | 1009 SigninViewController signin_view_controller_; |
| 1005 #endif | 1010 #endif |
| 1006 | 1011 |
| 1007 std::unique_ptr<ScopedKeepAlive> keep_alive_; | 1012 std::unique_ptr<ScopedKeepAlive> keep_alive_; |
| 1008 | 1013 |
| 1014 const std::unique_ptr<keyboard_lock::KeyboardLockHost> keyboard_lock_host_; |
| 1015 |
| 1009 // The following factory is used for chrome update coalescing. | 1016 // The following factory is used for chrome update coalescing. |
| 1010 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1017 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1011 | 1018 |
| 1012 // The following factory is used to close the frame at a later time. | 1019 // The following factory is used to close the frame at a later time. |
| 1013 base::WeakPtrFactory<Browser> weak_factory_; | 1020 base::WeakPtrFactory<Browser> weak_factory_; |
| 1014 | 1021 |
| 1015 DISALLOW_COPY_AND_ASSIGN(Browser); | 1022 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1016 }; | 1023 }; |
| 1017 | 1024 |
| 1018 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1025 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |