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

Side by Side Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

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 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 5 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "chrome/browser/autocomplete_history_manager.h" 9 #include "chrome/browser/autocomplete_history_manager.h"
10 #include "chrome/browser/autofill/autofill_external_delegate.h" 10 #include "chrome/browser/autofill/autofill_external_delegate.h"
(...skipping 26 matching lines...) Expand all
37 #include "chrome/browser/ui/hung_plugin_tab_helper.h" 37 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
38 #include "chrome/browser/ui/intents/web_intent_picker_controller.h" 38 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
39 #include "chrome/browser/ui/pdf/pdf_tab_observer.h" 39 #include "chrome/browser/ui/pdf/pdf_tab_observer.h"
40 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 40 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
41 #include "chrome/browser/ui/sad_tab_helper.h" 41 #include "chrome/browser/ui/sad_tab_helper.h"
42 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" 42 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
43 #include "chrome/browser/ui/snapshot_tab_helper.h" 43 #include "chrome/browser/ui/snapshot_tab_helper.h"
44 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 44 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
45 #include "chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h" 45 #include "chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.h"
46 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 46 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
47 #include "chrome/browser/ui/zoom/zoom_controller.h"
47 #include "chrome/browser/view_type_utils.h" 48 #include "chrome/browser/view_type_utils.h"
48 #include "chrome/common/chrome_notification_types.h" 49 #include "chrome/common/chrome_notification_types.h"
49 #include "chrome/common/chrome_switches.h" 50 #include "chrome/common/chrome_switches.h"
50 #include "chrome/common/thumbnail_support.h" 51 #include "chrome/common/thumbnail_support.h"
51 #include "content/public/browser/notification_service.h" 52 #include "content/public/browser/notification_service.h"
52 #include "content/public/browser/web_contents.h" 53 #include "content/public/browser/web_contents.h"
53 54
54 #if defined(OS_WIN) 55 #if defined(OS_WIN)
55 #include "base/win/metro.h" 56 #include "base/win/metro.h"
56 #endif 57 #endif
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 prefs_tab_helper_.reset(new PrefsTabHelper(contents)); 111 prefs_tab_helper_.reset(new PrefsTabHelper(contents));
111 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this)); 112 prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));
112 restore_tab_helper_.reset(new RestoreTabHelper(contents)); 113 restore_tab_helper_.reset(new RestoreTabHelper(contents));
113 search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents)); 114 search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents));
114 snapshot_tab_helper_.reset(new SnapshotTabHelper(contents)); 115 snapshot_tab_helper_.reset(new SnapshotTabHelper(contents));
115 ssl_helper_.reset(new TabContentsSSLHelper(this)); 116 ssl_helper_.reset(new TabContentsSSLHelper(this));
116 synced_tab_delegate_.reset(new TabContentsWrapperSyncedTabDelegate(this)); 117 synced_tab_delegate_.reset(new TabContentsWrapperSyncedTabDelegate(this));
117 content_settings_.reset(new TabSpecificContentSettings(contents)); 118 content_settings_.reset(new TabSpecificContentSettings(contents));
118 translate_tab_helper_.reset(new TranslateTabHelper(contents)); 119 translate_tab_helper_.reset(new TranslateTabHelper(contents));
119 web_intent_picker_controller_.reset(new WebIntentPickerController(this)); 120 web_intent_picker_controller_.reset(new WebIntentPickerController(this));
121 zoom_controller_.reset(new ZoomController(this));
120 122
121 #if !defined(OS_ANDROID) 123 #if !defined(OS_ANDROID)
122 print_view_manager_.reset(new printing::PrintViewManager(this)); 124 print_view_manager_.reset(new printing::PrintViewManager(this));
123 sad_tab_helper_.reset(new SadTabHelper(contents)); 125 sad_tab_helper_.reset(new SadTabHelper(contents));
124 #endif 126 #endif
125 127
126 // Create the per-tab observers. 128 // Create the per-tab observers.
127 alternate_error_page_tab_observer_.reset( 129 alternate_error_page_tab_observer_.reset(
128 new AlternateErrorPageTabObserver(contents, profile())); 130 new AlternateErrorPageTabObserver(contents, profile()));
129 webnavigation_observer_.reset( 131 webnavigation_observer_.reset(
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 234
233 //////////////////////////////////////////////////////////////////////////////// 235 ////////////////////////////////////////////////////////////////////////////////
234 // WebContentsObserver overrides 236 // WebContentsObserver overrides
235 237
236 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) { 238 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) {
237 // Destruction of the WebContents should only be done by us from our 239 // Destruction of the WebContents should only be done by us from our
238 // destructor. Otherwise it's very likely we (or one of the helpers we own) 240 // destructor. Otherwise it's very likely we (or one of the helpers we own)
239 // will attempt to access the WebContents and we'll crash. 241 // will attempt to access the WebContents and we'll crash.
240 DCHECK(in_destructor_); 242 DCHECK(in_destructor_);
241 } 243 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents_wrapper.h ('k') | chrome/browser/ui/views/frame/browser_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698