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

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: Rebased 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
« no previous file with comments | « no previous file | 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 #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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 92 }
92 93
93 class Browser : public TabStripModelDelegate, 94 class Browser : public TabStripModelDelegate,
94 public TabStripModelObserver, 95 public TabStripModelObserver,
95 public content::WebContentsDelegate, 96 public content::WebContentsDelegate,
96 public CoreTabHelperDelegate, 97 public CoreTabHelperDelegate,
97 public SearchEngineTabHelperDelegate, 98 public SearchEngineTabHelperDelegate,
98 public ConstrainedWindowTabHelperDelegate, 99 public ConstrainedWindowTabHelperDelegate,
99 public BlockedContentTabHelperDelegate, 100 public BlockedContentTabHelperDelegate,
100 public BookmarkTabHelperDelegate, 101 public BookmarkTabHelperDelegate,
102 public ZoomObserver,
101 public ExtensionTabHelperDelegate, 103 public ExtensionTabHelperDelegate,
102 public content::PageNavigator, 104 public content::PageNavigator,
103 public CommandUpdater::CommandUpdaterDelegate, 105 public CommandUpdater::CommandUpdaterDelegate,
104 public content::NotificationObserver, 106 public content::NotificationObserver,
105 public SelectFileDialog::Listener, 107 public SelectFileDialog::Listener,
106 public TabRestoreServiceObserver, 108 public TabRestoreServiceObserver,
107 public ProfileSyncServiceObserver, 109 public ProfileSyncServiceObserver,
108 public InstantDelegate { 110 public InstantDelegate {
109 public: 111 public:
110 // SessionService::WindowType mirrors these values. If you add to this 112 // SessionService::WindowType mirrors these values. If you add to this
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1012 bool blocked) OVERRIDE; 1014 bool blocked) OVERRIDE;
1013 1015
1014 // Overridden from BlockedContentTabHelperDelegate: 1016 // Overridden from BlockedContentTabHelperDelegate:
1015 virtual TabContentsWrapper* GetConstrainingContentsWrapper( 1017 virtual TabContentsWrapper* GetConstrainingContentsWrapper(
1016 TabContentsWrapper* source) OVERRIDE; 1018 TabContentsWrapper* source) OVERRIDE;
1017 1019
1018 // Overridden from BookmarkTabHelperDelegate: 1020 // Overridden from BookmarkTabHelperDelegate:
1019 virtual void URLStarredChanged(TabContentsWrapper* source, 1021 virtual void URLStarredChanged(TabContentsWrapper* source,
1020 bool starred) OVERRIDE; 1022 bool starred) OVERRIDE;
1021 1023
1024 // Overridden from ZoomObserver:
1025 virtual void OnZoomIconChanged(TabContentsWrapper* source,
1026 ZoomController::ZoomIconState state) OVERRIDE;
1027 virtual void OnZoomChanged(TabContentsWrapper* source,
1028 int zoom_percent,
1029 bool can_show_bubble) OVERRIDE;
1030
1022 // Overridden from ExtensionTabHelperDelegate: 1031 // Overridden from ExtensionTabHelperDelegate:
1023 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source, 1032 virtual void OnDidGetApplicationInfo(TabContentsWrapper* source,
1024 int32 page_id) OVERRIDE; 1033 int32 page_id) OVERRIDE;
1025 virtual void OnInstallApplication( 1034 virtual void OnInstallApplication(
1026 TabContentsWrapper* source, 1035 TabContentsWrapper* source,
1027 const WebApplicationInfo& app_info) OVERRIDE; 1036 const WebApplicationInfo& app_info) OVERRIDE;
1028 1037
1029 // Overridden from SelectFileDialog::Listener: 1038 // Overridden from SelectFileDialog::Listener:
1030 virtual void FileSelected(const FilePath& path, 1039 virtual void FileSelected(const FilePath& path,
1031 int index, 1040 int index,
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 bool window_has_shown_; 1424 bool window_has_shown_;
1416 1425
1417 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1426 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1418 // before DidEndColorChooser is called. 1427 // before DidEndColorChooser is called.
1419 scoped_ptr<content::ColorChooser> color_chooser_; 1428 scoped_ptr<content::ColorChooser> color_chooser_;
1420 1429
1421 DISALLOW_COPY_AND_ASSIGN(Browser); 1430 DISALLOW_COPY_AND_ASSIGN(Browser);
1422 }; 1431 };
1423 1432
1424 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1433 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698