OLD | NEW |
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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 rvh_callback_(base::Bind(&RenderViewHostCreated)), | 542 rvh_callback_(base::Bind(&RenderViewHostCreated)), |
543 record_search_engine_(false), | 543 record_search_engine_(false), |
544 translate_manager_(NULL), | 544 translate_manager_(NULL), |
545 profile_(NULL), | 545 profile_(NULL), |
546 run_message_loop_(true), | 546 run_message_loop_(true), |
547 notify_result_(ProcessSingleton::PROCESS_NONE), | 547 notify_result_(ProcessSingleton::PROCESS_NONE), |
548 do_first_run_tasks_(false), | 548 do_first_run_tasks_(false), |
549 local_state_(NULL), | 549 local_state_(NULL), |
550 restart_last_session_(false) { | 550 restart_last_session_(false) { |
551 // If we're running tests (ui_task is non-null). | 551 // If we're running tests (ui_task is non-null). |
552 if (parameters.ui_task) { | 552 if (parameters.ui_task) |
553 browser_defaults::enable_help_app = false; | 553 browser_defaults::enable_help_app = false; |
554 browser_defaults::enable_component_quick_office = false; | |
555 } | |
556 | 554 |
557 // Chrome disallows cookies by default. All code paths that want to use | 555 // Chrome disallows cookies by default. All code paths that want to use |
558 // cookies need to go through one of Chrome's URLRequestContexts which have | 556 // cookies need to go through one of Chrome's URLRequestContexts which have |
559 // a ChromeNetworkDelegate attached that selectively allows cookies again. | 557 // a ChromeNetworkDelegate attached that selectively allows cookies again. |
560 if (!disable_enforcing_cookie_policies_for_tests_) | 558 if (!disable_enforcing_cookie_policies_for_tests_) |
561 net::URLRequest::SetDefaultCookiePolicyToBlock(); | 559 net::URLRequest::SetDefaultCookiePolicyToBlock(); |
562 | 560 |
563 content::RenderViewHost::AddCreatedCallback(rvh_callback_); | 561 content::RenderViewHost::AddCreatedCallback(rvh_callback_); |
564 } | 562 } |
565 | 563 |
(...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1749 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1747 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1750 uma_name += "_XP"; | 1748 uma_name += "_XP"; |
1751 | 1749 |
1752 uma_name += "_PreRead_"; | 1750 uma_name += "_PreRead_"; |
1753 uma_name += pre_read_percentage; | 1751 uma_name += pre_read_percentage; |
1754 AddPreReadHistogramTime(uma_name.c_str(), time); | 1752 AddPreReadHistogramTime(uma_name.c_str(), time); |
1755 } | 1753 } |
1756 #endif | 1754 #endif |
1757 #endif | 1755 #endif |
1758 } | 1756 } |
OLD | NEW |