| 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/prefs/public/pref_change_registrar.h" | 18 #include "base/prefs/public/pref_change_registrar.h" |
| 19 #include "base/prefs/public/pref_observer.h" | |
| 20 #include "base/string16.h" | 19 #include "base/string16.h" |
| 21 #include "chrome/browser/api/prefs/pref_member.h" | 20 #include "chrome/browser/api/prefs/pref_member.h" |
| 22 #include "chrome/browser/debugger/devtools_toggle_action.h" | 21 #include "chrome/browser/debugger/devtools_toggle_action.h" |
| 23 #include "chrome/browser/event_disposition.h" | 22 #include "chrome/browser/event_disposition.h" |
| 24 #include "chrome/browser/sessions/session_id.h" | 23 #include "chrome/browser/sessions/session_id.h" |
| 25 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" | 24 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.
h" |
| 26 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" | 25 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
| 27 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" | 26 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |
| 28 #include "chrome/browser/ui/browser_navigator.h" | 27 #include "chrome/browser/ui/browser_navigator.h" |
| 29 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" | 28 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 class Browser : public TabStripModelObserver, | 100 class Browser : public TabStripModelObserver, |
| 102 public content::WebContentsDelegate, | 101 public content::WebContentsDelegate, |
| 103 public CoreTabHelperDelegate, | 102 public CoreTabHelperDelegate, |
| 104 public SearchEngineTabHelperDelegate, | 103 public SearchEngineTabHelperDelegate, |
| 105 public ConstrainedWindowTabHelperDelegate, | 104 public ConstrainedWindowTabHelperDelegate, |
| 106 public BlockedContentTabHelperDelegate, | 105 public BlockedContentTabHelperDelegate, |
| 107 public BookmarkTabHelperDelegate, | 106 public BookmarkTabHelperDelegate, |
| 108 public ZoomObserver, | 107 public ZoomObserver, |
| 109 public content::PageNavigator, | 108 public content::PageNavigator, |
| 110 public content::NotificationObserver, | 109 public content::NotificationObserver, |
| 111 public PrefObserver, | |
| 112 public ui::SelectFileDialog::Listener, | 110 public ui::SelectFileDialog::Listener, |
| 113 public chrome::search::SearchModelObserver { | 111 public chrome::search::SearchModelObserver { |
| 114 public: | 112 public: |
| 115 // SessionService::WindowType mirrors these values. If you add to this | 113 // SessionService::WindowType mirrors these values. If you add to this |
| 116 // enum, look at SessionService::WindowType to see if it needs to be | 114 // enum, look at SessionService::WindowType to see if it needs to be |
| 117 // updated. | 115 // updated. |
| 118 enum Type { | 116 enum Type { |
| 119 // If you add a new type, consider updating the test | 117 // If you add a new type, consider updating the test |
| 120 // BrowserTest.StartMaximized. | 118 // BrowserTest.StartMaximized. |
| 121 TYPE_TABBED = 1, | 119 TYPE_TABBED = 1, |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 688 virtual void FileSelectedWithExtraInfo( | 686 virtual void FileSelectedWithExtraInfo( |
| 689 const ui::SelectedFileInfo& file_info, | 687 const ui::SelectedFileInfo& file_info, |
| 690 int index, | 688 int index, |
| 691 void* params) OVERRIDE; | 689 void* params) OVERRIDE; |
| 692 | 690 |
| 693 // Overridden from content::NotificationObserver: | 691 // Overridden from content::NotificationObserver: |
| 694 virtual void Observe(int type, | 692 virtual void Observe(int type, |
| 695 const content::NotificationSource& source, | 693 const content::NotificationSource& source, |
| 696 const content::NotificationDetails& details) OVERRIDE; | 694 const content::NotificationDetails& details) OVERRIDE; |
| 697 | 695 |
| 698 // Overridden from PrefObserver: | |
| 699 virtual void OnPreferenceChanged(PrefServiceBase* service, | |
| 700 const std::string& pref_name) OVERRIDE; | |
| 701 | |
| 702 // Overridden from chrome::search::SearchModelObserver: | 696 // Overridden from chrome::search::SearchModelObserver: |
| 703 virtual void ModeChanged(const chrome::search::Mode& old_mode, | 697 virtual void ModeChanged(const chrome::search::Mode& old_mode, |
| 704 const chrome::search::Mode& new_mode) OVERRIDE; | 698 const chrome::search::Mode& new_mode) OVERRIDE; |
| 705 | 699 |
| 706 // Command and state updating /////////////////////////////////////////////// | 700 // Command and state updating /////////////////////////////////////////////// |
| 707 | 701 |
| 702 // Handle changes to kDevTools preference. |
| 703 void OnDevToolsDisabledChanged(); |
| 704 |
| 708 // Set the preference that indicates that the home page has been changed. | 705 // Set the preference that indicates that the home page has been changed. |
| 709 void MarkHomePageAsChanged(PrefService* pref_service); | 706 void MarkHomePageAsChanged(); |
| 710 | 707 |
| 711 // UI update coalescing and handling //////////////////////////////////////// | 708 // UI update coalescing and handling //////////////////////////////////////// |
| 712 | 709 |
| 713 // Asks the toolbar (and as such the location bar) to update its state to | 710 // Asks the toolbar (and as such the location bar) to update its state to |
| 714 // reflect the current tab's current URL, security state, etc. | 711 // reflect the current tab's current URL, security state, etc. |
| 715 // If |should_restore_state| is true, we're switching (back?) to this tab and | 712 // If |should_restore_state| is true, we're switching (back?) to this tab and |
| 716 // should restore any previous location bar state (such as user editing) as | 713 // should restore any previous location bar state (such as user editing) as |
| 717 // well. | 714 // well. |
| 718 void UpdateToolbar(bool should_restore_state); | 715 void UpdateToolbar(bool should_restore_state); |
| 719 | 716 |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 bool window_has_shown_; | 948 bool window_has_shown_; |
| 952 | 949 |
| 953 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 950 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 954 // before DidEndColorChooser is called. | 951 // before DidEndColorChooser is called. |
| 955 scoped_ptr<content::ColorChooser> color_chooser_; | 952 scoped_ptr<content::ColorChooser> color_chooser_; |
| 956 | 953 |
| 957 DISALLOW_COPY_AND_ASSIGN(Browser); | 954 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 958 }; | 955 }; |
| 959 | 956 |
| 960 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 957 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |