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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/gtest_prod_util.h" | 15 #include "base/gtest_prod_util.h" |
| 16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" |
| 18 #include "base/string16.h" | 18 #include "base/string16.h" |
| 19 #include "chrome/browser/debugger/devtools_toggle_action.h" | 19 #include "chrome/browser/debugger/devtools_toggle_action.h" |
| 20 #include "chrome/browser/event_disposition.h" | 20 #include "chrome/browser/event_disposition.h" |
| 21 #include "chrome/browser/intents/device_attached_intent_source.h" | 21 #include "chrome/browser/intents/device_attached_intent_source.h" |
| 22 #include "chrome/browser/prefs/pref_change_registrar.h" | 22 #include "chrome/browser/prefs/pref_change_registrar.h" |
| 23 #include "chrome/browser/prefs/pref_member.h" | 23 #include "chrome/browser/prefs/pref_member.h" |
| 24 #include "chrome/browser/sessions/session_id.h" | 24 #include "chrome/browser/sessions/session_id.h" |
| 25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" | 25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" |
| 26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
| 27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" | 27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |
| 28 #include "chrome/browser/ui/browser_navigator.h" | 28 #include "chrome/browser/ui/browser_navigator.h" |
| 29 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" | 29 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" |
| 30 #include "chrome/browser/ui/metro_pin_tab_helper.h" | |
| 30 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" | 31 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" |
| 31 #include "chrome/browser/ui/select_file_dialog.h" | 32 #include "chrome/browser/ui/select_file_dialog.h" |
| 32 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" | 33 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" |
| 33 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| 34 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 35 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 35 #include "chrome/browser/ui/zoom/zoom_observer.h" | 36 #include "chrome/browser/ui/zoom/zoom_observer.h" |
| 36 #include "chrome/common/content_settings.h" | 37 #include "chrome/common/content_settings.h" |
| 37 #include "chrome/common/content_settings_types.h" | 38 #include "chrome/common/content_settings_types.h" |
| 38 #include "chrome/common/extensions/extension_constants.h" | 39 #include "chrome/common/extensions/extension_constants.h" |
| 39 #include "content/public/browser/notification_registrar.h" | 40 #include "content/public/browser/notification_registrar.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 struct WebIntentServiceData; | 93 struct WebIntentServiceData; |
| 93 } | 94 } |
| 94 | 95 |
| 95 class Browser : public TabStripModelObserver, | 96 class Browser : public TabStripModelObserver, |
| 96 public content::WebContentsDelegate, | 97 public content::WebContentsDelegate, |
| 97 public CoreTabHelperDelegate, | 98 public CoreTabHelperDelegate, |
| 98 public SearchEngineTabHelperDelegate, | 99 public SearchEngineTabHelperDelegate, |
| 99 public ConstrainedWindowTabHelperDelegate, | 100 public ConstrainedWindowTabHelperDelegate, |
| 100 public BlockedContentTabHelperDelegate, | 101 public BlockedContentTabHelperDelegate, |
| 101 public BookmarkTabHelperDelegate, | 102 public BookmarkTabHelperDelegate, |
| 103 public MetroPinTabHelper::Delegate, | |
|
sky
2012/07/20 16:46:41
I don't like browser implementing an interface tha
benwells
2012/07/23 08:03:43
Yep, thanks for the suggestion! I didn't like all
| |
| 102 public ZoomObserver, | 104 public ZoomObserver, |
| 103 public content::PageNavigator, | 105 public content::PageNavigator, |
| 104 public content::NotificationObserver, | 106 public content::NotificationObserver, |
| 105 public SelectFileDialog::Listener { | 107 public SelectFileDialog::Listener { |
| 106 public: | 108 public: |
| 107 // SessionService::WindowType mirrors these values. If you add to this | 109 // SessionService::WindowType mirrors these values. If you add to this |
| 108 // enum, look at SessionService::WindowType to see if it needs to be | 110 // enum, look at SessionService::WindowType to see if it needs to be |
| 109 // updated. | 111 // updated. |
| 110 enum Type { | 112 enum Type { |
| 111 // If you add a new type, consider updating the test | 113 // If you add a new type, consider updating the test |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 669 virtual void SetTabContentBlocked(TabContents* contents, | 671 virtual void SetTabContentBlocked(TabContents* contents, |
| 670 bool blocked) OVERRIDE; | 672 bool blocked) OVERRIDE; |
| 671 | 673 |
| 672 // Overridden from BlockedContentTabHelperDelegate: | 674 // Overridden from BlockedContentTabHelperDelegate: |
| 673 virtual TabContents* GetConstrainingTabContents(TabContents* source) OVERRIDE; | 675 virtual TabContents* GetConstrainingTabContents(TabContents* source) OVERRIDE; |
| 674 | 676 |
| 675 // Overridden from BookmarkTabHelperDelegate: | 677 // Overridden from BookmarkTabHelperDelegate: |
| 676 virtual void URLStarredChanged(TabContents* source, | 678 virtual void URLStarredChanged(TabContents* source, |
| 677 bool starred) OVERRIDE; | 679 bool starred) OVERRIDE; |
| 678 | 680 |
| 681 // Overridden from MetroPinTabHelperDelegate: | |
| 682 virtual void IsPinnedChanged(content::WebContents* source, | |
| 683 bool is_pinned) OVERRIDE; | |
| 684 | |
| 679 // Overridden from ZoomObserver: | 685 // Overridden from ZoomObserver: |
| 680 virtual void OnZoomIconChanged(TabContents* source, | 686 virtual void OnZoomIconChanged(TabContents* source, |
| 681 ZoomController::ZoomIconState state) OVERRIDE; | 687 ZoomController::ZoomIconState state) OVERRIDE; |
| 682 virtual void OnZoomChanged(TabContents* source, | 688 virtual void OnZoomChanged(TabContents* source, |
| 683 int zoom_percent, | 689 int zoom_percent, |
| 684 bool can_show_bubble) OVERRIDE; | 690 bool can_show_bubble) OVERRIDE; |
| 685 | 691 |
| 686 // Overridden from SelectFileDialog::Listener: | 692 // Overridden from SelectFileDialog::Listener: |
| 687 virtual void FileSelected(const FilePath& path, | 693 virtual void FileSelected(const FilePath& path, |
| 688 int index, | 694 int index, |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 925 bool window_has_shown_; | 931 bool window_has_shown_; |
| 926 | 932 |
| 927 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 933 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 928 // before DidEndColorChooser is called. | 934 // before DidEndColorChooser is called. |
| 929 scoped_ptr<content::ColorChooser> color_chooser_; | 935 scoped_ptr<content::ColorChooser> color_chooser_; |
| 930 | 936 |
| 931 DISALLOW_COPY_AND_ASSIGN(Browser); | 937 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 932 }; | 938 }; |
| 933 | 939 |
| 934 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 940 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |