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

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

Issue 1951153002: Remove AddSearchProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test Created 4 years, 7 months 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
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 11 matching lines...) Expand all
22 #include "build/build_config.h" 22 #include "build/build_config.h"
23 #include "chrome/browser/devtools/devtools_toggle_action.h" 23 #include "chrome/browser/devtools/devtools_toggle_action.h"
24 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 24 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
25 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 25 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
26 #include "chrome/browser/ui/browser_navigator.h" 26 #include "chrome/browser/ui/browser_navigator.h"
27 #include "chrome/browser/ui/chrome_bubble_manager.h" 27 #include "chrome/browser/ui/chrome_bubble_manager.h"
28 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" 28 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
29 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" 29 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
30 #include "chrome/browser/ui/profile_chooser_constants.h" 30 #include "chrome/browser/ui/profile_chooser_constants.h"
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/search_engines/search_engine_tab_helper_delegate.h"
33 #include "chrome/browser/ui/signin_view_controller.h" 32 #include "chrome/browser/ui/signin_view_controller.h"
34 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 33 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
35 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 34 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
36 #include "components/content_settings/core/common/content_settings.h" 35 #include "components/content_settings/core/common/content_settings.h"
37 #include "components/content_settings/core/common/content_settings_types.h" 36 #include "components/content_settings/core/common/content_settings_types.h"
38 #include "components/prefs/pref_change_registrar.h" 37 #include "components/prefs/pref_change_registrar.h"
39 #include "components/prefs/pref_member.h" 38 #include "components/prefs/pref_member.h"
40 #include "components/sessions/core/session_id.h" 39 #include "components/sessions/core/session_id.h"
41 #include "components/toolbar/toolbar_model.h" 40 #include "components/toolbar/toolbar_model.h"
42 #include "components/translate/content/browser/content_translate_driver.h" 41 #include "components/translate/content/browser/content_translate_driver.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 class WebDialogDelegate; 102 class WebDialogDelegate;
104 } 103 }
105 104
106 namespace web_modal { 105 namespace web_modal {
107 class WebContentsModalDialogHost; 106 class WebContentsModalDialogHost;
108 } 107 }
109 108
110 class Browser : public TabStripModelObserver, 109 class Browser : public TabStripModelObserver,
111 public content::WebContentsDelegate, 110 public content::WebContentsDelegate,
112 public CoreTabHelperDelegate, 111 public CoreTabHelperDelegate,
113 public SearchEngineTabHelperDelegate,
114 public SearchTabHelperDelegate, 112 public SearchTabHelperDelegate,
115 public ChromeWebModalDialogManagerDelegate, 113 public ChromeWebModalDialogManagerDelegate,
116 public BookmarkTabHelperDelegate, 114 public BookmarkTabHelperDelegate,
117 public ui_zoom::ZoomObserver, 115 public ui_zoom::ZoomObserver,
118 public content::PageNavigator, 116 public content::PageNavigator,
119 public content::NotificationObserver, 117 public content::NotificationObserver,
120 #if defined(ENABLE_EXTENSIONS) 118 #if defined(ENABLE_EXTENSIONS)
121 public extensions::ExtensionRegistryObserver, 119 public extensions::ExtensionRegistryObserver,
122 #endif 120 #endif
123 public translate::ContentTranslateDriver::Observer, 121 public translate::ContentTranslateDriver::Observer,
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 683
686 // Overridden from CoreTabHelperDelegate: 684 // Overridden from CoreTabHelperDelegate:
687 // Note that the caller is responsible for deleting |old_contents|. 685 // Note that the caller is responsible for deleting |old_contents|.
688 void SwapTabContents(content::WebContents* old_contents, 686 void SwapTabContents(content::WebContents* old_contents,
689 content::WebContents* new_contents, 687 content::WebContents* new_contents,
690 bool did_start_load, 688 bool did_start_load,
691 bool did_finish_load) override; 689 bool did_finish_load) override;
692 bool CanReloadContents(content::WebContents* web_contents) const override; 690 bool CanReloadContents(content::WebContents* web_contents) const override;
693 bool CanSaveContents(content::WebContents* web_contents) const override; 691 bool CanSaveContents(content::WebContents* web_contents) const override;
694 692
695 // Overridden from SearchEngineTabHelperDelegate:
696 void ConfirmAddSearchProvider(TemplateURL* template_url,
697 Profile* profile) override;
698
699 // Overridden from SearchTabHelperDelegate: 693 // Overridden from SearchTabHelperDelegate:
700 void NavigateOnThumbnailClick(const GURL& url, 694 void NavigateOnThumbnailClick(const GURL& url,
701 WindowOpenDisposition disposition, 695 WindowOpenDisposition disposition,
702 content::WebContents* source_contents) override; 696 content::WebContents* source_contents) override;
703 void OnWebContentsInstantSupportDisabled( 697 void OnWebContentsInstantSupportDisabled(
704 const content::WebContents* web_contents) override; 698 const content::WebContents* web_contents) override;
705 OmniboxView* GetOmniboxView() override; 699 OmniboxView* GetOmniboxView() override;
706 std::set<std::string> GetOpenUrls() override; 700 std::set<std::string> GetOpenUrls() override;
707 701
708 // Overridden from WebContentsModalDialogManagerDelegate: 702 // Overridden from WebContentsModalDialogManagerDelegate:
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 // The following factory is used for chrome update coalescing. 1010 // The following factory is used for chrome update coalescing.
1017 base::WeakPtrFactory<Browser> chrome_updater_factory_; 1011 base::WeakPtrFactory<Browser> chrome_updater_factory_;
1018 1012
1019 // The following factory is used to close the frame at a later time. 1013 // The following factory is used to close the frame at a later time.
1020 base::WeakPtrFactory<Browser> weak_factory_; 1014 base::WeakPtrFactory<Browser> weak_factory_;
1021 1015
1022 DISALLOW_COPY_AND_ASSIGN(Browser); 1016 DISALLOW_COPY_AND_ASSIGN(Browser);
1023 }; 1017 };
1024 1018
1025 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1019 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698