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

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

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete defines in build files. Created 6 years 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/autofill/chrome_autofill_client.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 <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 23 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
24 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 24 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
25 #include "chrome/browser/ui/browser_navigator.h" 25 #include "chrome/browser/ui/browser_navigator.h"
26 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" 26 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
27 #include "chrome/browser/ui/host_desktop.h" 27 #include "chrome/browser/ui/host_desktop.h"
28 #include "chrome/browser/ui/search/search_tab_helper_delegate.h" 28 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
29 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 29 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
30 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 30 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
31 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 31 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
32 #include "chrome/browser/ui/toolbar/toolbar_model.h" 32 #include "chrome/browser/ui/toolbar/toolbar_model.h"
33 #include "chrome/browser/ui/zoom/zoom_observer.h"
34 #include "components/content_settings/core/common/content_settings.h" 33 #include "components/content_settings/core/common/content_settings.h"
35 #include "components/content_settings/core/common/content_settings_types.h" 34 #include "components/content_settings/core/common/content_settings_types.h"
36 #include "components/sessions/session_id.h" 35 #include "components/sessions/session_id.h"
36 #include "components/ui/zoom/zoom_observer.h"
37 #include "content/public/browser/notification_observer.h" 37 #include "content/public/browser/notification_observer.h"
38 #include "content/public/browser/notification_registrar.h" 38 #include "content/public/browser/notification_registrar.h"
39 #include "content/public/browser/page_navigator.h" 39 #include "content/public/browser/page_navigator.h"
40 #include "content/public/browser/web_contents_delegate.h" 40 #include "content/public/browser/web_contents_delegate.h"
41 #include "content/public/common/page_zoom.h" 41 #include "content/public/common/page_zoom.h"
42 #include "ui/base/page_transition_types.h" 42 #include "ui/base/page_transition_types.h"
43 #include "ui/base/ui_base_types.h" 43 #include "ui/base/ui_base_types.h"
44 #include "ui/base/window_open_disposition.h" 44 #include "ui/base/window_open_disposition.h"
45 #include "ui/gfx/rect.h" 45 #include "ui/gfx/rect.h"
46 #include "ui/shell_dialogs/select_file_dialog.h" 46 #include "ui/shell_dialogs/select_file_dialog.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 class WebContentsModalDialogHost; 101 class WebContentsModalDialogHost;
102 } 102 }
103 103
104 class Browser : public TabStripModelObserver, 104 class Browser : public TabStripModelObserver,
105 public content::WebContentsDelegate, 105 public content::WebContentsDelegate,
106 public CoreTabHelperDelegate, 106 public CoreTabHelperDelegate,
107 public SearchEngineTabHelperDelegate, 107 public SearchEngineTabHelperDelegate,
108 public SearchTabHelperDelegate, 108 public SearchTabHelperDelegate,
109 public ChromeWebModalDialogManagerDelegate, 109 public ChromeWebModalDialogManagerDelegate,
110 public BookmarkTabHelperDelegate, 110 public BookmarkTabHelperDelegate,
111 public ZoomObserver, 111 public ui_zoom::ZoomObserver,
112 public content::PageNavigator, 112 public content::PageNavigator,
113 public content::NotificationObserver, 113 public content::NotificationObserver,
114 #if defined(ENABLE_EXTENSIONS) 114 #if defined(ENABLE_EXTENSIONS)
115 public extensions::ExtensionRegistryObserver, 115 public extensions::ExtensionRegistryObserver,
116 #endif 116 #endif
117 public ui::SelectFileDialog::Listener { 117 public ui::SelectFileDialog::Listener {
118 public: 118 public:
119 // SessionService::WindowType mirrors these values. If you add to this 119 // SessionService::WindowType mirrors these values. If you add to this
120 // enum, look at SessionService::WindowType to see if it needs to be 120 // enum, look at SessionService::WindowType to see if it needs to be
121 // updated. 121 // updated.
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 void SetWebContentsBlocked(content::WebContents* web_contents, 677 void SetWebContentsBlocked(content::WebContents* web_contents,
678 bool blocked) override; 678 bool blocked) override;
679 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() 679 web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
680 override; 680 override;
681 681
682 // Overridden from BookmarkTabHelperDelegate: 682 // Overridden from BookmarkTabHelperDelegate:
683 void URLStarredChanged(content::WebContents* web_contents, 683 void URLStarredChanged(content::WebContents* web_contents,
684 bool starred) override; 684 bool starred) override;
685 685
686 // Overridden from ZoomObserver: 686 // Overridden from ZoomObserver:
687 void OnZoomChanged(const ZoomController::ZoomChangedEventData& data) override; 687 void OnZoomChanged(
688 const ui_zoom::ZoomController::ZoomChangedEventData& data) override;
688 689
689 // Overridden from SelectFileDialog::Listener: 690 // Overridden from SelectFileDialog::Listener:
690 void FileSelected(const base::FilePath& path, 691 void FileSelected(const base::FilePath& path,
691 int index, 692 int index,
692 void* params) override; 693 void* params) override;
693 void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info, 694 void FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info,
694 int index, 695 int index,
695 void* params) override; 696 void* params) override;
696 697
697 // Overridden from content::NotificationObserver: 698 // Overridden from content::NotificationObserver:
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 967
967 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; 968 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_;
968 969
969 // The following factory is used to close the frame at a later time. 970 // The following factory is used to close the frame at a later time.
970 base::WeakPtrFactory<Browser> weak_factory_; 971 base::WeakPtrFactory<Browser> weak_factory_;
971 972
972 DISALLOW_COPY_AND_ASSIGN(Browser); 973 DISALLOW_COPY_AND_ASSIGN(Browser);
973 }; 974 };
974 975
975 #endif // CHROME_BROWSER_UI_BROWSER_H_ 976 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/autofill/chrome_autofill_client.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698