| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 notify_disconnection_(false), | 250 notify_disconnection_(false), |
| 251 history_requests_(), | 251 history_requests_(), |
| 252 #if defined(OS_WIN) | 252 #if defined(OS_WIN) |
| 253 message_box_active_(CreateEvent(NULL, TRUE, FALSE, NULL)), | 253 message_box_active_(CreateEvent(NULL, TRUE, FALSE, NULL)), |
| 254 #endif | 254 #endif |
| 255 last_javascript_message_dismissal_(), | 255 last_javascript_message_dismissal_(), |
| 256 suppress_javascript_messages_(false) { | 256 suppress_javascript_messages_(false) { |
| 257 pending_install_.page_id = 0; | 257 pending_install_.page_id = 0; |
| 258 pending_install_.callback_functor = NULL; | 258 pending_install_.callback_functor = NULL; |
| 259 | 259 |
| 260 #if defined(LINUX2) | 260 #if defined(OS_CHROMEOS) |
| 261 // Make sure the thumbnailer is started before starting the render manager. | 261 // Make sure the thumbnailer is started before starting the render manager. |
| 262 // The thumbnailer will want to listen for RVH creations, one of which will | 262 // The thumbnailer will want to listen for RVH creations, one of which will |
| 263 // happen in RVHManager::Init. | 263 // happen in RVHManager::Init. |
| 264 ThumbnailGenerator* generator = g_browser_process->GetThumbnailGenerator(); | 264 ThumbnailGenerator* generator = g_browser_process->GetThumbnailGenerator(); |
| 265 if (generator) | 265 if (generator) |
| 266 generator->StartThumbnailing(); | 266 generator->StartThumbnailing(); |
| 267 #endif | 267 #endif |
| 268 | 268 |
| 269 render_manager_.Init(profile, site_instance, routing_id, modal_dialog_event); | 269 render_manager_.Init(profile, site_instance, routing_id, modal_dialog_event); |
| 270 | 270 |
| (...skipping 2079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2350 NavigationController::LoadCommittedDetails& committed_details = | 2350 NavigationController::LoadCommittedDetails& committed_details = |
| 2351 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); | 2351 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); |
| 2352 ExpireInfoBars(committed_details); | 2352 ExpireInfoBars(committed_details); |
| 2353 break; | 2353 break; |
| 2354 } | 2354 } |
| 2355 | 2355 |
| 2356 default: | 2356 default: |
| 2357 NOTREACHED(); | 2357 NOTREACHED(); |
| 2358 } | 2358 } |
| 2359 } | 2359 } |
| OLD | NEW |