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

Side by Side Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.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
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_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 5 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 6 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 27 matching lines...) Expand all
38 class Profile; 38 class Profile;
39 class RestoreTabHelper; 39 class RestoreTabHelper;
40 class SadTabHelper; 40 class SadTabHelper;
41 class SearchEngineTabHelper; 41 class SearchEngineTabHelper;
42 class SnapshotTabHelper; 42 class SnapshotTabHelper;
43 class TabContentsSSLHelper; 43 class TabContentsSSLHelper;
44 class TabSpecificContentSettings; 44 class TabSpecificContentSettings;
45 class ThumbnailGenerator; 45 class ThumbnailGenerator;
46 class TranslateTabHelper; 46 class TranslateTabHelper;
47 class WebIntentPickerController; 47 class WebIntentPickerController;
48 class ZoomController;
48 49
49 #if defined(ENABLE_ONE_CLICK_SIGNIN) 50 #if defined(ENABLE_ONE_CLICK_SIGNIN)
50 class OneClickSigninHelper; 51 class OneClickSigninHelper;
51 #endif 52 #endif
52 53
53 namespace browser_sync { 54 namespace browser_sync {
54 class SyncedTabDelegate; 55 class SyncedTabDelegate;
55 } 56 }
56 57
57 namespace extensions { 58 namespace extensions {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 } 215 }
215 216
216 TranslateTabHelper* translate_tab_helper() { 217 TranslateTabHelper* translate_tab_helper() {
217 return translate_tab_helper_.get(); 218 return translate_tab_helper_.get();
218 } 219 }
219 220
220 WebIntentPickerController* web_intent_picker_controller() { 221 WebIntentPickerController* web_intent_picker_controller() {
221 return web_intent_picker_controller_.get(); 222 return web_intent_picker_controller_.get();
222 } 223 }
223 224
225 ZoomController* zoom_controller() {
226 return zoom_controller_.get();
227 }
228
224 // Overrides ----------------------------------------------------------------- 229 // Overrides -----------------------------------------------------------------
225 230
226 // content::WebContentsObserver overrides: 231 // content::WebContentsObserver overrides:
227 virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE; 232 virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
228 233
229 private: 234 private:
230 // Used to retrieve this object from |web_contents_|, which is placed in 235 // Used to retrieve this object from |web_contents_|, which is placed in
231 // its property bag to avoid adding additional interfaces. 236 // its property bag to avoid adding additional interfaces.
232 static base::PropertyAccessor<TabContentsWrapper*>* property_accessor(); 237 static base::PropertyAccessor<TabContentsWrapper*>* property_accessor();
233 238
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 // The TabSpecificContentSettings object is used to query the blocked content 276 // The TabSpecificContentSettings object is used to query the blocked content
272 // state by various UI elements. 277 // state by various UI elements.
273 scoped_ptr<TabSpecificContentSettings> content_settings_; 278 scoped_ptr<TabSpecificContentSettings> content_settings_;
274 279
275 scoped_ptr<ThumbnailGenerator> thumbnail_generator_; 280 scoped_ptr<ThumbnailGenerator> thumbnail_generator_;
276 scoped_ptr<TranslateTabHelper> translate_tab_helper_; 281 scoped_ptr<TranslateTabHelper> translate_tab_helper_;
277 282
278 // Handles displaying a web intents picker to the user. 283 // Handles displaying a web intents picker to the user.
279 scoped_ptr<WebIntentPickerController> web_intent_picker_controller_; 284 scoped_ptr<WebIntentPickerController> web_intent_picker_controller_;
280 285
286 scoped_ptr<ZoomController> zoom_controller_;
287
281 // Per-tab observers --------------------------------------------------------- 288 // Per-tab observers ---------------------------------------------------------
282 // (These provide no API for callers; objects that need to exist 1:1 with tabs 289 // (These provide no API for callers; objects that need to exist 1:1 with tabs
283 // and silently do their thing live here.) 290 // and silently do their thing live here.)
284 291
285 scoped_ptr<AlternateErrorPageTabObserver> alternate_error_page_tab_observer_; 292 scoped_ptr<AlternateErrorPageTabObserver> alternate_error_page_tab_observer_;
286 scoped_ptr<extensions::WebNavigationTabObserver> webnavigation_observer_; 293 scoped_ptr<extensions::WebNavigationTabObserver> webnavigation_observer_;
287 scoped_ptr<ExternalProtocolObserver> external_protocol_observer_; 294 scoped_ptr<ExternalProtocolObserver> external_protocol_observer_;
288 scoped_ptr<OmniboxSearchHint> omnibox_search_hint_; 295 scoped_ptr<OmniboxSearchHint> omnibox_search_hint_;
289 #if defined(ENABLE_ONE_CLICK_SIGNIN) 296 #if defined(ENABLE_ONE_CLICK_SIGNIN)
290 scoped_ptr<OneClickSigninHelper> one_click_signin_helper_; 297 scoped_ptr<OneClickSigninHelper> one_click_signin_helper_;
(...skipping 11 matching lines...) Expand all
302 309
303 // The supporting objects need to outlive the WebContents dtor (as they may 310 // The supporting objects need to outlive the WebContents dtor (as they may
304 // be called upon during its execution). As a result, this must come last 311 // be called upon during its execution). As a result, this must come last
305 // in the list. 312 // in the list.
306 scoped_ptr<content::WebContents> web_contents_; 313 scoped_ptr<content::WebContents> web_contents_;
307 314
308 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper); 315 DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
309 }; 316 };
310 317
311 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ 318 #endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_window.cc ('k') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698