| 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 20 matching lines...) Expand all Loading... |
| 31 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" | 31 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" |
| 32 #include "chrome/browser/ui/signin_view_controller.h" | 32 #include "chrome/browser/ui/signin_view_controller.h" |
| 33 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 33 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 35 #include "components/content_settings/core/common/content_settings.h" | 35 #include "components/content_settings/core/common/content_settings.h" |
| 36 #include "components/content_settings/core/common/content_settings_types.h" | 36 #include "components/content_settings/core/common/content_settings_types.h" |
| 37 #include "components/prefs/pref_change_registrar.h" | 37 #include "components/prefs/pref_change_registrar.h" |
| 38 #include "components/prefs/pref_member.h" | 38 #include "components/prefs/pref_member.h" |
| 39 #include "components/sessions/core/session_id.h" | 39 #include "components/sessions/core/session_id.h" |
| 40 #include "components/toolbar/toolbar_model.h" | 40 #include "components/toolbar/toolbar_model.h" |
| 41 #include "components/translate/content/browser/content_translate_driver.h" | 41 #include "components/translate/content/browser/content_translate_driver_impl.h" |
| 42 #include "components/zoom/zoom_observer.h" | 42 #include "components/zoom/zoom_observer.h" |
| 43 #include "content/public/browser/notification_observer.h" | 43 #include "content/public/browser/notification_observer.h" |
| 44 #include "content/public/browser/notification_registrar.h" | 44 #include "content/public/browser/notification_registrar.h" |
| 45 #include "content/public/browser/page_navigator.h" | 45 #include "content/public/browser/page_navigator.h" |
| 46 #include "content/public/browser/web_contents_delegate.h" | 46 #include "content/public/browser/web_contents_delegate.h" |
| 47 #include "content/public/common/page_zoom.h" | 47 #include "content/public/common/page_zoom.h" |
| 48 #include "ui/base/page_transition_types.h" | 48 #include "ui/base/page_transition_types.h" |
| 49 #include "ui/base/ui_base_types.h" | 49 #include "ui/base/ui_base_types.h" |
| 50 #include "ui/base/window_open_disposition.h" | 50 #include "ui/base/window_open_disposition.h" |
| 51 #include "ui/gfx/geometry/rect.h" | 51 #include "ui/gfx/geometry/rect.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 public CoreTabHelperDelegate, | 111 public CoreTabHelperDelegate, |
| 112 public SearchTabHelperDelegate, | 112 public SearchTabHelperDelegate, |
| 113 public ChromeWebModalDialogManagerDelegate, | 113 public ChromeWebModalDialogManagerDelegate, |
| 114 public BookmarkTabHelperDelegate, | 114 public BookmarkTabHelperDelegate, |
| 115 public zoom::ZoomObserver, | 115 public zoom::ZoomObserver, |
| 116 public content::PageNavigator, | 116 public content::PageNavigator, |
| 117 public content::NotificationObserver, | 117 public content::NotificationObserver, |
| 118 #if defined(ENABLE_EXTENSIONS) | 118 #if defined(ENABLE_EXTENSIONS) |
| 119 public extensions::ExtensionRegistryObserver, | 119 public extensions::ExtensionRegistryObserver, |
| 120 #endif | 120 #endif |
| 121 public translate::ContentTranslateDriver::Observer, | 121 public translate::ContentTranslateDriverImpl::Observer, |
| 122 public ui::SelectFileDialog::Listener { | 122 public ui::SelectFileDialog::Listener { |
| 123 public: | 123 public: |
| 124 // SessionService::WindowType mirrors these values. If you add to this | 124 // SessionService::WindowType mirrors these values. If you add to this |
| 125 // enum, look at SessionService::WindowType to see if it needs to be | 125 // enum, look at SessionService::WindowType to see if it needs to be |
| 126 // updated. | 126 // updated. |
| 127 enum Type { | 127 enum Type { |
| 128 // If you add a new type, consider updating the test | 128 // If you add a new type, consider updating the test |
| 129 // BrowserTest.StartMaximized. | 129 // BrowserTest.StartMaximized. |
| 130 TYPE_TABBED = 1, | 130 TYPE_TABBED = 1, |
| 131 TYPE_POPUP = 2 | 131 TYPE_POPUP = 2 |
| (...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 const extensions::Extension* extension, | 731 const extensions::Extension* extension, |
| 732 extensions::UninstallReason reason) override; | 732 extensions::UninstallReason reason) override; |
| 733 void OnExtensionLoaded(content::BrowserContext* browser_context, | 733 void OnExtensionLoaded(content::BrowserContext* browser_context, |
| 734 const extensions::Extension* extension) override; | 734 const extensions::Extension* extension) override; |
| 735 void OnExtensionUnloaded( | 735 void OnExtensionUnloaded( |
| 736 content::BrowserContext* browser_context, | 736 content::BrowserContext* browser_context, |
| 737 const extensions::Extension* extension, | 737 const extensions::Extension* extension, |
| 738 extensions::UnloadedExtensionInfo::Reason reason) override; | 738 extensions::UnloadedExtensionInfo::Reason reason) override; |
| 739 #endif | 739 #endif |
| 740 | 740 |
| 741 // Overridden from translate::ContentTranslateDriver::Observer: | 741 // Overridden from translate::ContentTranslateDriverImpl::Observer: |
| 742 void OnIsPageTranslatedChanged(content::WebContents* source) override; | 742 void OnIsPageTranslatedChanged(content::WebContents* source) override; |
| 743 void OnTranslateEnabledChanged(content::WebContents* source) override; | 743 void OnTranslateEnabledChanged(content::WebContents* source) override; |
| 744 | 744 |
| 745 // Command and state updating /////////////////////////////////////////////// | 745 // Command and state updating /////////////////////////////////////////////// |
| 746 | 746 |
| 747 // Handle changes to kDevTools preference. | 747 // Handle changes to kDevTools preference. |
| 748 void OnDevToolsDisabledChanged(); | 748 void OnDevToolsDisabledChanged(); |
| 749 | 749 |
| 750 // UI update coalescing and handling //////////////////////////////////////// | 750 // UI update coalescing and handling //////////////////////////////////////// |
| 751 | 751 |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1009 // The following factory is used for chrome update coalescing. | 1009 // The following factory is used for chrome update coalescing. |
| 1010 base::WeakPtrFactory<Browser> chrome_updater_factory_; | 1010 base::WeakPtrFactory<Browser> chrome_updater_factory_; |
| 1011 | 1011 |
| 1012 // The following factory is used to close the frame at a later time. | 1012 // The following factory is used to close the frame at a later time. |
| 1013 base::WeakPtrFactory<Browser> weak_factory_; | 1013 base::WeakPtrFactory<Browser> weak_factory_; |
| 1014 | 1014 |
| 1015 DISALLOW_COPY_AND_ASSIGN(Browser); | 1015 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1016 }; | 1016 }; |
| 1017 | 1017 |
| 1018 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1018 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |