Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 27 matching lines...) Expand all
38 #include "components/prefs/pref_change_registrar.h" 38 #include "components/prefs/pref_change_registrar.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.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 "extensions/features/features.h"
48 #include "ui/base/page_transition_types.h" 49 #include "ui/base/page_transition_types.h"
49 #include "ui/base/ui_base_types.h" 50 #include "ui/base/ui_base_types.h"
50 #include "ui/base/window_open_disposition.h" 51 #include "ui/base/window_open_disposition.h"
51 #include "ui/gfx/geometry/rect.h" 52 #include "ui/gfx/geometry/rect.h"
52 #include "ui/shell_dialogs/select_file_dialog.h" 53 #include "ui/shell_dialogs/select_file_dialog.h"
53 54
54 #if defined(ENABLE_EXTENSIONS) 55 #if BUILDFLAG(ENABLE_EXTENSIONS)
55 #include "extensions/browser/extension_registry_observer.h" 56 #include "extensions/browser/extension_registry_observer.h"
56 #endif 57 #endif
57 58
58 class BrowserContentSettingBubbleModelDelegate; 59 class BrowserContentSettingBubbleModelDelegate;
59 class BrowserInstantController; 60 class BrowserInstantController;
60 class BrowserSyncedWindowDelegate; 61 class BrowserSyncedWindowDelegate;
61 class BrowserToolbarModelDelegate; 62 class BrowserToolbarModelDelegate;
62 class BrowserLiveTabContext; 63 class BrowserLiveTabContext;
63 class BrowserWindow; 64 class BrowserWindow;
64 class FindBarController; 65 class FindBarController;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 109
109 class Browser : public TabStripModelObserver, 110 class Browser : public TabStripModelObserver,
110 public content::WebContentsDelegate, 111 public content::WebContentsDelegate,
111 public CoreTabHelperDelegate, 112 public CoreTabHelperDelegate,
112 public SearchTabHelperDelegate, 113 public SearchTabHelperDelegate,
113 public ChromeWebModalDialogManagerDelegate, 114 public ChromeWebModalDialogManagerDelegate,
114 public BookmarkTabHelperDelegate, 115 public BookmarkTabHelperDelegate,
115 public zoom::ZoomObserver, 116 public zoom::ZoomObserver,
116 public content::PageNavigator, 117 public content::PageNavigator,
117 public content::NotificationObserver, 118 public content::NotificationObserver,
118 #if defined(ENABLE_EXTENSIONS) 119 #if BUILDFLAG(ENABLE_EXTENSIONS)
119 public extensions::ExtensionRegistryObserver, 120 public extensions::ExtensionRegistryObserver,
120 #endif 121 #endif
121 public translate::ContentTranslateDriver::Observer, 122 public translate::ContentTranslateDriver::Observer,
122 public ui::SelectFileDialog::Listener { 123 public ui::SelectFileDialog::Listener {
123 public: 124 public:
124 // SessionService::WindowType mirrors these values. If you add to this 125 // SessionService::WindowType mirrors these values. If you add to this
125 // enum, look at SessionService::WindowType to see if it needs to be 126 // enum, look at SessionService::WindowType to see if it needs to be
126 // updated. 127 // updated.
127 enum Type { 128 enum Type {
128 // If you add a new type, consider updating the test 129 // If you add a new type, consider updating the test
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 void* params) override; 723 void* params) override;
723 void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info, 724 void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info,
724 int index, 725 int index,
725 void* params) override; 726 void* params) override;
726 727
727 // Overridden from content::NotificationObserver: 728 // Overridden from content::NotificationObserver:
728 void Observe(int type, 729 void Observe(int type,
729 const content::NotificationSource& source, 730 const content::NotificationSource& source,
730 const content::NotificationDetails& details) override; 731 const content::NotificationDetails& details) override;
731 732
732 #if defined(ENABLE_EXTENSIONS) 733 #if BUILDFLAG(ENABLE_EXTENSIONS)
733 // Overridden from extensions::ExtensionRegistryObserver: 734 // Overridden from extensions::ExtensionRegistryObserver:
734 void OnExtensionUninstalled(content::BrowserContext* browser_context, 735 void OnExtensionUninstalled(content::BrowserContext* browser_context,
735 const extensions::Extension* extension, 736 const extensions::Extension* extension,
736 extensions::UninstallReason reason) override; 737 extensions::UninstallReason reason) override;
737 void OnExtensionLoaded(content::BrowserContext* browser_context, 738 void OnExtensionLoaded(content::BrowserContext* browser_context,
738 const extensions::Extension* extension) override; 739 const extensions::Extension* extension) override;
739 void OnExtensionUnloaded( 740 void OnExtensionUnloaded(
740 content::BrowserContext* browser_context, 741 content::BrowserContext* browser_context,
741 const extensions::Extension* extension, 742 const extensions::Extension* extension,
742 extensions::UnloadedExtensionInfo::Reason reason) override; 743 extensions::UnloadedExtensionInfo::Reason reason) override;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 const GURL& target_url, 865 const GURL& target_url,
865 const std::string& partition_id, 866 const std::string& partition_id,
866 content::SessionStorageNamespace* session_storage_namespace); 867 content::SessionStorageNamespace* session_storage_namespace);
867 868
868 // Data members ///////////////////////////////////////////////////////////// 869 // Data members /////////////////////////////////////////////////////////////
869 870
870 std::vector<InterstitialObserver*> interstitial_observers_; 871 std::vector<InterstitialObserver*> interstitial_observers_;
871 872
872 content::NotificationRegistrar registrar_; 873 content::NotificationRegistrar registrar_;
873 874
874 #if defined(ENABLE_EXTENSIONS) 875 #if BUILDFLAG(ENABLE_EXTENSIONS)
875 ScopedObserver<extensions::ExtensionRegistry, 876 ScopedObserver<extensions::ExtensionRegistry,
876 extensions::ExtensionRegistryObserver> 877 extensions::ExtensionRegistryObserver>
877 extension_registry_observer_; 878 extension_registry_observer_;
878 #endif 879 #endif
879 880
880 PrefChangeRegistrar profile_pref_registrar_; 881 PrefChangeRegistrar profile_pref_registrar_;
881 882
882 // This Browser's type. 883 // This Browser's type.
883 const Type type_; 884 const Type type_;
884 885
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 // The following factory is used for chrome update coalescing. 1011 // The following factory is used for chrome update coalescing.
1011 base::WeakPtrFactory<Browser> chrome_updater_factory_; 1012 base::WeakPtrFactory<Browser> chrome_updater_factory_;
1012 1013
1013 // The following factory is used to close the frame at a later time. 1014 // The following factory is used to close the frame at a later time.
1014 base::WeakPtrFactory<Browser> weak_factory_; 1015 base::WeakPtrFactory<Browser> weak_factory_;
1015 1016
1016 DISALLOW_COPY_AND_ASSIGN(Browser); 1017 DISALLOW_COPY_AND_ASSIGN(Browser);
1017 }; 1018 };
1018 1019
1019 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1020 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698