| 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 18 matching lines...) Expand all Loading... |
| 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/prefs/pref_change_registrar.h" | 35 #include "components/prefs/pref_change_registrar.h" |
| 36 #include "components/sessions/core/session_id.h" | 36 #include "components/sessions/core/session_id.h" |
| 37 #include "components/toolbar/toolbar_model.h" | 37 #include "components/toolbar/toolbar_model.h" |
| 38 #include "components/translate/content/browser/content_translate_driver.h" | 38 #include "components/translate/content/browser/content_translate_driver.h" |
| 39 #include "components/zoom/zoom_observer.h" | |
| 40 #include "content/public/browser/notification_observer.h" | 39 #include "content/public/browser/notification_observer.h" |
| 41 #include "content/public/browser/notification_registrar.h" | 40 #include "content/public/browser/notification_registrar.h" |
| 42 #include "content/public/browser/page_navigator.h" | 41 #include "content/public/browser/page_navigator.h" |
| 43 #include "content/public/browser/web_contents.h" | 42 #include "content/public/browser/web_contents.h" |
| 44 #include "content/public/browser/web_contents_delegate.h" | 43 #include "content/public/browser/web_contents_delegate.h" |
| 45 #include "content/public/common/page_zoom.h" | 44 #include "content/public/common/page_zoom.h" |
| 46 #include "extensions/features/features.h" | 45 #include "extensions/features/features.h" |
| 47 #include "ui/base/page_transition_types.h" | 46 #include "ui/base/page_transition_types.h" |
| 48 #include "ui/base/ui_base_types.h" | 47 #include "ui/base/ui_base_types.h" |
| 49 #include "ui/base/window_open_disposition.h" | 48 #include "ui/base/window_open_disposition.h" |
| 50 #include "ui/gfx/geometry/rect.h" | 49 #include "ui/gfx/geometry/rect.h" |
| 51 #include "ui/shell_dialogs/select_file_dialog.h" | 50 #include "ui/shell_dialogs/select_file_dialog.h" |
| 52 | 51 |
| 53 #if !defined(OS_CHROMEOS) | 52 #if !defined(OS_CHROMEOS) |
| 54 #include "chrome/browser/ui/signin_view_controller.h" | 53 #include "chrome/browser/ui/signin_view_controller.h" |
| 55 #endif | 54 #endif |
| 56 | 55 |
| 56 #if !defined(OS_ANDROID) |
| 57 #include "components/zoom/zoom_observer.h" |
| 58 #endif // !defined(OS_ANDROID) |
| 59 |
| 57 #if BUILDFLAG(ENABLE_EXTENSIONS) | 60 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 58 #include "extensions/browser/extension_registry_observer.h" | 61 #include "extensions/browser/extension_registry_observer.h" |
| 59 #endif | 62 #endif |
| 60 | 63 |
| 61 class BrowserContentSettingBubbleModelDelegate; | 64 class BrowserContentSettingBubbleModelDelegate; |
| 62 class BrowserInstantController; | 65 class BrowserInstantController; |
| 63 class BrowserSyncedWindowDelegate; | 66 class BrowserSyncedWindowDelegate; |
| 64 class BrowserToolbarModelDelegate; | 67 class BrowserToolbarModelDelegate; |
| 65 class BrowserLiveTabContext; | 68 class BrowserLiveTabContext; |
| 66 class BrowserWindow; | 69 class BrowserWindow; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 106 |
| 104 namespace web_modal { | 107 namespace web_modal { |
| 105 class WebContentsModalDialogHost; | 108 class WebContentsModalDialogHost; |
| 106 } | 109 } |
| 107 | 110 |
| 108 class Browser : public TabStripModelObserver, | 111 class Browser : public TabStripModelObserver, |
| 109 public content::WebContentsDelegate, | 112 public content::WebContentsDelegate, |
| 110 public CoreTabHelperDelegate, | 113 public CoreTabHelperDelegate, |
| 111 public ChromeWebModalDialogManagerDelegate, | 114 public ChromeWebModalDialogManagerDelegate, |
| 112 public BookmarkTabHelperDelegate, | 115 public BookmarkTabHelperDelegate, |
| 116 #if !defined(OS_ANDROID) |
| 113 public zoom::ZoomObserver, | 117 public zoom::ZoomObserver, |
| 118 #endif // !defined(OS_ANDROID) |
| 114 public content::PageNavigator, | 119 public content::PageNavigator, |
| 115 public content::NotificationObserver, | 120 public content::NotificationObserver, |
| 116 #if BUILDFLAG(ENABLE_EXTENSIONS) | 121 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 117 public extensions::ExtensionRegistryObserver, | 122 public extensions::ExtensionRegistryObserver, |
| 118 #endif | 123 #endif |
| 119 public translate::ContentTranslateDriver::Observer, | 124 public translate::ContentTranslateDriver::Observer, |
| 120 public ui::SelectFileDialog::Listener { | 125 public ui::SelectFileDialog::Listener { |
| 121 public: | 126 public: |
| 122 // SessionService::WindowType mirrors these values. If you add to this | 127 // SessionService::WindowType mirrors these values. If you add to this |
| 123 // enum, look at SessionService::WindowType to see if it needs to be | 128 // enum, look at SessionService::WindowType to see if it needs to be |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 // Overridden from WebContentsModalDialogManagerDelegate: | 713 // Overridden from WebContentsModalDialogManagerDelegate: |
| 709 void SetWebContentsBlocked(content::WebContents* web_contents, | 714 void SetWebContentsBlocked(content::WebContents* web_contents, |
| 710 bool blocked) override; | 715 bool blocked) override; |
| 711 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() | 716 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() |
| 712 override; | 717 override; |
| 713 | 718 |
| 714 // Overridden from BookmarkTabHelperDelegate: | 719 // Overridden from BookmarkTabHelperDelegate: |
| 715 void URLStarredChanged(content::WebContents* web_contents, | 720 void URLStarredChanged(content::WebContents* web_contents, |
| 716 bool starred) override; | 721 bool starred) override; |
| 717 | 722 |
| 723 #if !defined(OS_ANDROID) |
| 718 // Overridden from ZoomObserver: | 724 // Overridden from ZoomObserver: |
| 719 void OnZoomChanged( | 725 void OnZoomChanged( |
| 720 const zoom::ZoomController::ZoomChangedEventData& data) override; | 726 const zoom::ZoomController::ZoomChangedEventData& data) override; |
| 727 #endif // !defined(OS_ANDROID) |
| 721 | 728 |
| 722 // Overridden from SelectFileDialog::Listener: | 729 // Overridden from SelectFileDialog::Listener: |
| 723 void FileSelected(const base::FilePath& path, | 730 void FileSelected(const base::FilePath& path, |
| 724 int index, | 731 int index, |
| 725 void* params) override; | 732 void* params) override; |
| 726 void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info, | 733 void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info, |
| 727 int index, | 734 int index, |
| 728 void* params) override; | 735 void* params) override; |
| 729 | 736 |
| 730 // Overridden from content::NotificationObserver: | 737 // Overridden from content::NotificationObserver: |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |