Chromium Code Reviews| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 33 #include "chrome/browser/ui/browser_navigator.h" | 33 #include "chrome/browser/ui/browser_navigator.h" |
| 34 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" | 34 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" |
| 35 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" | 35 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" |
| 36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
| 37 #include "chrome/browser/ui/select_file_dialog.h" | 37 #include "chrome/browser/ui/select_file_dialog.h" |
| 38 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 38 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 39 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" | 39 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" |
| 40 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 40 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 41 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 41 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 42 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 42 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
| 43 #include "chrome/browser/ui/zoom/zoom_tab_helper_delegate.h" | |
| 43 #include "chrome/common/content_settings.h" | 44 #include "chrome/common/content_settings.h" |
| 44 #include "chrome/common/content_settings_types.h" | 45 #include "chrome/common/content_settings_types.h" |
| 45 #include "chrome/common/extensions/extension_constants.h" | 46 #include "chrome/common/extensions/extension_constants.h" |
| 46 #include "content/public/browser/notification_registrar.h" | 47 #include "content/public/browser/notification_registrar.h" |
| 47 #include "content/public/browser/page_navigator.h" | 48 #include "content/public/browser/page_navigator.h" |
| 48 #include "content/public/browser/web_contents_delegate.h" | 49 #include "content/public/browser/web_contents_delegate.h" |
| 49 #include "content/public/common/page_transition_types.h" | 50 #include "content/public/common/page_transition_types.h" |
| 50 #include "content/public/common/page_zoom.h" | 51 #include "content/public/common/page_zoom.h" |
| 51 #include "ui/base/ui_base_types.h" | 52 #include "ui/base/ui_base_types.h" |
| 52 #include "ui/gfx/rect.h" | 53 #include "ui/gfx/rect.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 } | 85 } |
| 85 | 86 |
| 86 class Browser : public TabStripModelDelegate, | 87 class Browser : public TabStripModelDelegate, |
| 87 public TabStripModelObserver, | 88 public TabStripModelObserver, |
| 88 public content::WebContentsDelegate, | 89 public content::WebContentsDelegate, |
| 89 public CoreTabHelperDelegate, | 90 public CoreTabHelperDelegate, |
| 90 public SearchEngineTabHelperDelegate, | 91 public SearchEngineTabHelperDelegate, |
| 91 public ConstrainedWindowTabHelperDelegate, | 92 public ConstrainedWindowTabHelperDelegate, |
| 92 public BlockedContentTabHelperDelegate, | 93 public BlockedContentTabHelperDelegate, |
| 93 public BookmarkTabHelperDelegate, | 94 public BookmarkTabHelperDelegate, |
| 95 public ZoomTabHelperDelegate, | |
|
Ben Goodger (Google)
2012/05/29 18:04:41
rather than make Browser be the observer, and then
Kyle Horimoto
2012/05/31 23:13:52
As discussed offline, if the Browser is not the ob
| |
| 94 public ExtensionTabHelperDelegate, | 96 public ExtensionTabHelperDelegate, |
| 95 public content::PageNavigator, | 97 public content::PageNavigator, |
| 96 public CommandUpdater::CommandUpdaterDelegate, | 98 public CommandUpdater::CommandUpdaterDelegate, |
| 97 public content::NotificationObserver, | 99 public content::NotificationObserver, |
| 98 public SelectFileDialog::Listener, | 100 public SelectFileDialog::Listener, |
| 99 public TabRestoreServiceObserver, | 101 public TabRestoreServiceObserver, |
| 100 public ProfileSyncServiceObserver, | 102 public ProfileSyncServiceObserver, |
| 101 public InstantDelegate { | 103 public InstantDelegate { |
| 102 public: | 104 public: |
| 103 // SessionService::WindowType mirrors these values. If you add to this | 105 // SessionService::WindowType mirrors these values. If you add to this |
| (...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1004 bool blocked) OVERRIDE; | 1006 bool blocked) OVERRIDE; |
| 1005 | 1007 |
| 1006 // Overridden from BlockedContentTabHelperDelegate: | 1008 // Overridden from BlockedContentTabHelperDelegate: |
| 1007 virtual TabContentsWrapper* GetConstrainingContentsWrapper( | 1009 virtual TabContentsWrapper* GetConstrainingContentsWrapper( |
| 1008 TabContentsWrapper* source) OVERRIDE; | 1010 TabContentsWrapper* source) OVERRIDE; |
| 1009 | 1011 |
| 1010 // Overridden from BookmarkTabHelperDelegate: | 1012 // Overridden from BookmarkTabHelperDelegate: |
| 1011 virtual void URLStarredChanged(TabContentsWrapper* source, | 1013 virtual void URLStarredChanged(TabContentsWrapper* source, |
| 1012 bool starred) OVERRIDE; | 1014 bool starred) OVERRIDE; |
| 1013 | 1015 |
| 1016 // Overridden from ZoomTabHelperDelegate: | |
| 1017 virtual void ZoomIconStateChanged(TabContentsWrapper *source, | |
| 1018 ZoomTabHelper::ZoomIconState state, | |
| 1019 int zoomPercent) OVERRIDE; | |
| 1020 virtual void ZoomChanged(TabContentsWrapper *source, | |
| 1021 int zoomPercent) OVERRIDE; | |
| 1022 | |
| 1014 // Overridden from ExtensionTabHelperDelegate: | 1023 // Overridden from ExtensionTabHelperDelegate: |
| 1015 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, | 1024 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, |
| 1016 int32 page_id) OVERRIDE; | 1025 int32 page_id) OVERRIDE; |
| 1017 virtual void OnInstallApplication( | 1026 virtual void OnInstallApplication( |
| 1018 TabContentsWrapper* source, | 1027 TabContentsWrapper* source, |
| 1019 const WebApplicationInfo& app_info) OVERRIDE; | 1028 const WebApplicationInfo& app_info) OVERRIDE; |
| 1020 | 1029 |
| 1021 // Overridden from SelectFileDialog::Listener: | 1030 // Overridden from SelectFileDialog::Listener: |
| 1022 virtual void FileSelected(const FilePath& path, | 1031 virtual void FileSelected(const FilePath& path, |
| 1023 int index, | 1032 int index, |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1406 bool window_has_shown_; | 1415 bool window_has_shown_; |
| 1407 | 1416 |
| 1408 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1417 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1409 // before DidEndColorChooser is called. | 1418 // before DidEndColorChooser is called. |
| 1410 scoped_ptr<content::ColorChooser> color_chooser_; | 1419 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1411 | 1420 |
| 1412 DISALLOW_COPY_AND_ASSIGN(Browser); | 1421 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1413 }; | 1422 }; |
| 1414 | 1423 |
| 1415 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1424 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |