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

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

Issue 5520001: Remove initialization of ThumbnailGenerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "chrome/browser/search_engines/template_url_fetcher_ui_callbacks.h" 72 #include "chrome/browser/search_engines/template_url_fetcher_ui_callbacks.h"
73 #include "chrome/browser/search_engines/template_url_model.h" 73 #include "chrome/browser/search_engines/template_url_model.h"
74 #include "chrome/browser/sessions/session_types.h" 74 #include "chrome/browser/sessions/session_types.h"
75 #include "chrome/browser/tab_contents/infobar_delegate.h" 75 #include "chrome/browser/tab_contents/infobar_delegate.h"
76 #include "chrome/browser/tab_contents/interstitial_page.h" 76 #include "chrome/browser/tab_contents/interstitial_page.h"
77 #include "chrome/browser/tab_contents/navigation_entry.h" 77 #include "chrome/browser/tab_contents/navigation_entry.h"
78 #include "chrome/browser/tab_contents/provisional_load_details.h" 78 #include "chrome/browser/tab_contents/provisional_load_details.h"
79 #include "chrome/browser/tab_contents/tab_contents_delegate.h" 79 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
80 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" 80 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
81 #include "chrome/browser/tab_contents/tab_contents_view.h" 81 #include "chrome/browser/tab_contents/tab_contents_view.h"
82 #include "chrome/browser/tab_contents/thumbnail_generator.h"
83 #include "chrome/browser/tab_contents/web_navigation_observer.h" 82 #include "chrome/browser/tab_contents/web_navigation_observer.h"
84 #include "chrome/browser/translate/page_translated_details.h" 83 #include "chrome/browser/translate/page_translated_details.h"
85 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" 84 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
86 #include "chrome/common/bindings_policy.h" 85 #include "chrome/common/bindings_policy.h"
87 #include "chrome/common/chrome_switches.h" 86 #include "chrome/common/chrome_switches.h"
88 #include "chrome/common/extensions/extension.h" 87 #include "chrome/common/extensions/extension.h"
89 #include "chrome/common/extensions/extension_action.h" 88 #include "chrome/common/extensions/extension_action.h"
90 #include "chrome/common/extensions/extension_icon_set.h" 89 #include "chrome/common/extensions/extension_icon_set.h"
91 #include "chrome/common/extensions/extension_resource.h" 90 #include "chrome/common/extensions/extension_resource.h"
92 #include "chrome/common/extensions/url_pattern.h" 91 #include "chrome/common/extensions/url_pattern.h"
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 maximum_zoom_percent_( 375 maximum_zoom_percent_(
377 static_cast<int>(WebKit::WebView::maxTextSizeMultiplier * 100)), 376 static_cast<int>(WebKit::WebView::maxTextSizeMultiplier * 100)),
378 temporary_zoom_settings_(false), 377 temporary_zoom_settings_(false),
379 content_restrictions_(0) { 378 content_restrictions_(0) {
380 renderer_preferences_util::UpdateFromSystemSettings( 379 renderer_preferences_util::UpdateFromSystemSettings(
381 &renderer_preferences_, profile); 380 &renderer_preferences_, profile);
382 381
383 content_settings_delegate_.reset( 382 content_settings_delegate_.reset(
384 new TabSpecificContentSettings(this, profile)); 383 new TabSpecificContentSettings(this, profile));
385 384
386 #if defined(OS_CHROMEOS)
387 // Make sure the thumbnailer is started before starting the render manager.
388 // The thumbnailer will want to listen for RVH creations, one of which will
389 // happen in RVHManager::Init.
390 ThumbnailGenerator* generator = g_browser_process->GetThumbnailGenerator();
391 if (generator)
392 generator->StartThumbnailing();
393 #endif
394
395 render_manager_.Init(profile, site_instance, routing_id); 385 render_manager_.Init(profile, site_instance, routing_id);
396 386
397 // We have the initial size of the view be based on the size of the passed in 387 // We have the initial size of the view be based on the size of the passed in
398 // tab contents (normally a tab from the same window). 388 // tab contents (normally a tab from the same window).
399 view_->CreateView(base_tab_contents ? 389 view_->CreateView(base_tab_contents ?
400 base_tab_contents->view()->GetContainerSize() : gfx::Size()); 390 base_tab_contents->view()->GetContainerSize() : gfx::Size());
401 391
402 // Register for notifications about all interested prefs change. 392 // Register for notifications about all interested prefs change.
403 PrefService* prefs = profile->GetPrefs(); 393 PrefService* prefs = profile->GetPrefs();
404 pref_change_registrar_.Init(prefs); 394 pref_change_registrar_.Init(prefs);
(...skipping 2840 matching lines...) Expand 10 before | Expand all | Expand 10 after
3245 } 3235 }
3246 3236
3247 void TabContents::set_encoding(const std::string& encoding) { 3237 void TabContents::set_encoding(const std::string& encoding) {
3248 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding); 3238 encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
3249 } 3239 }
3250 3240
3251 void TabContents::SetAppIcon(const SkBitmap& app_icon) { 3241 void TabContents::SetAppIcon(const SkBitmap& app_icon) {
3252 app_icon_ = app_icon; 3242 app_icon_ = app_icon;
3253 NotifyNavigationStateChanged(INVALIDATE_TITLE); 3243 NotifyNavigationStateChanged(INVALIDATE_TITLE);
3254 } 3244 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698