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

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

Issue 10444040: Tracks changes to zoom icon and zoom percentage. Notifies browser window if the icon should be chan… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Changed delegate to observer Created 8 years, 6 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 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/ui/browser_navigator.h" 33 #include "chrome/browser/ui/browser_navigator.h"
34 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" 34 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
35 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" 35 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h"
36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 36 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
37 #include "chrome/browser/ui/select_file_dialog.h" 37 #include "chrome/browser/ui/select_file_dialog.h"
38 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 38 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
39 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 39 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
40 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 40 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
41 #include "chrome/browser/ui/toolbar/toolbar_model.h" 41 #include "chrome/browser/ui/toolbar/toolbar_model.h"
42 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 42 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
43 #include "chrome/browser/ui/zoom/zoom_observer.h"
43 #include "chrome/common/content_settings.h" 44 #include "chrome/common/content_settings.h"
44 #include "chrome/common/content_settings_types.h" 45 #include "chrome/common/content_settings_types.h"
45 #include "chrome/common/extensions/extension_constants.h" 46 #include "chrome/common/extensions/extension_constants.h"
46 #include "content/public/browser/notification_registrar.h" 47 #include "content/public/browser/notification_registrar.h"
47 #include "content/public/browser/page_navigator.h" 48 #include "content/public/browser/page_navigator.h"
48 #include "content/public/browser/web_contents_delegate.h" 49 #include "content/public/browser/web_contents_delegate.h"
49 #include "content/public/common/page_transition_types.h" 50 #include "content/public/common/page_transition_types.h"
50 #include "content/public/common/page_zoom.h" 51 #include "content/public/common/page_zoom.h"
51 #include "ui/base/ui_base_types.h" 52 #include "ui/base/ui_base_types.h"
52 #include "ui/gfx/rect.h" 53 #include "ui/gfx/rect.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 } 88 }
88 89
89 class Browser : public TabStripModelDelegate, 90 class Browser : public TabStripModelDelegate,
90 public TabStripModelObserver, 91 public TabStripModelObserver,
91 public content::WebContentsDelegate, 92 public content::WebContentsDelegate,
92 public CoreTabHelperDelegate, 93 public CoreTabHelperDelegate,
93 public SearchEngineTabHelperDelegate, 94 public SearchEngineTabHelperDelegate,
94 public ConstrainedWindowTabHelperDelegate, 95 public ConstrainedWindowTabHelperDelegate,
95 public BlockedContentTabHelperDelegate, 96 public BlockedContentTabHelperDelegate,
96 public BookmarkTabHelperDelegate, 97 public BookmarkTabHelperDelegate,
98 public ZoomObserver,
tfarina 2012/06/01 00:47:53 To be honest I think ZoomTabHelper and ZoomTabHelp
Kyle Horimoto 2012/06/01 18:04:50 I'd also be interested to hear the reasoning. Ben?
97 public ExtensionTabHelperDelegate, 99 public ExtensionTabHelperDelegate,
98 public content::PageNavigator, 100 public content::PageNavigator,
99 public CommandUpdater::CommandUpdaterDelegate, 101 public CommandUpdater::CommandUpdaterDelegate,
100 public content::NotificationObserver, 102 public content::NotificationObserver,
101 public SelectFileDialog::Listener, 103 public SelectFileDialog::Listener,
102 public TabRestoreServiceObserver, 104 public TabRestoreServiceObserver,
103 public ProfileSyncServiceObserver, 105 public ProfileSyncServiceObserver,
104 public InstantDelegate { 106 public InstantDelegate {
105 public: 107 public:
106 // SessionService::WindowType mirrors these values. If you add to this 108 // SessionService::WindowType mirrors these values. If you add to this
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 bool blocked) OVERRIDE; 1009 bool blocked) OVERRIDE;
1008 1010
1009 // Overridden from BlockedContentTabHelperDelegate: 1011 // Overridden from BlockedContentTabHelperDelegate:
1010 virtual TabContentsWrapper* GetConstrainingContentsWrapper( 1012 virtual TabContentsWrapper* GetConstrainingContentsWrapper(
1011 TabContentsWrapper* source) OVERRIDE; 1013 TabContentsWrapper* source) OVERRIDE;
1012 1014
1013 // Overridden from BookmarkTabHelperDelegate: 1015 // Overridden from BookmarkTabHelperDelegate:
1014 virtual void URLStarredChanged(TabContentsWrapper* source, 1016 virtual void URLStarredChanged(TabContentsWrapper* source,
1015 bool starred) OVERRIDE; 1017 bool starred) OVERRIDE;
1016 1018
1019 // Overridden from ZoomObserver:
1020 virtual void OnZoomIconChanged(TabContentsWrapper* source,
1021 ZoomController::ZoomIconState state) OVERRIDE;
1022 virtual void OnZoomChanged(TabContentsWrapper* source,
1023 int zoom_percent) OVERRIDE;
1024
1017 // Overridden from ExtensionTabHelperDelegate: 1025 // Overridden from ExtensionTabHelperDelegate:
1018 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, 1026 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source,
1019 int32 page_id) OVERRIDE; 1027 int32 page_id) OVERRIDE;
1020 virtual void OnInstallApplication( 1028 virtual void OnInstallApplication(
1021 TabContentsWrapper* source, 1029 TabContentsWrapper* source,
1022 const WebApplicationInfo& app_info) OVERRIDE; 1030 const WebApplicationInfo& app_info) OVERRIDE;
1023 1031
1024 // Overridden from SelectFileDialog::Listener: 1032 // Overridden from SelectFileDialog::Listener:
1025 virtual void FileSelected(const FilePath& path, 1033 virtual void FileSelected(const FilePath& path,
1026 int index, 1034 int index,
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 bool window_has_shown_; 1418 bool window_has_shown_;
1411 1419
1412 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1420 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1413 // before DidEndColorChooser is called. 1421 // before DidEndColorChooser is called.
1414 scoped_ptr<content::ColorChooser> color_chooser_; 1422 scoped_ptr<content::ColorChooser> color_chooser_;
1415 1423
1416 DISALLOW_COPY_AND_ASSIGN(Browser); 1424 DISALLOW_COPY_AND_ASSIGN(Browser);
1417 }; 1425 };
1418 1426
1419 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1427 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/cocoa/browser_window_cocoa.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698