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

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

Issue 6254004: Move more web widgets painting from webkit to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and fix width100percent-checkbox Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/native_theme_chromeos.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 #include "chrome/browser/service/service_process_control_manager.h" 69 #include "chrome/browser/service/service_process_control_manager.h"
70 #include "chrome/browser/shell_integration.h" 70 #include "chrome/browser/shell_integration.h"
71 #include "chrome/browser/translate/translate_manager.h" 71 #include "chrome/browser/translate/translate_manager.h"
72 #include "chrome/browser/ui/browser.h" 72 #include "chrome/browser/ui/browser.h"
73 #include "chrome/browser/ui/browser_init.h" 73 #include "chrome/browser/ui/browser_init.h"
74 #include "chrome/common/child_process.h" 74 #include "chrome/common/child_process.h"
75 #include "chrome/common/chrome_constants.h" 75 #include "chrome/common/chrome_constants.h"
76 #include "chrome/common/chrome_paths.h" 76 #include "chrome/common/chrome_paths.h"
77 #include "chrome/common/chrome_switches.h" 77 #include "chrome/common/chrome_switches.h"
78 #include "chrome/common/env_vars.h" 78 #include "chrome/common/env_vars.h"
79 #include "chrome/common/gfx_resource_provider.h"
79 #include "chrome/common/hi_res_timer_manager.h" 80 #include "chrome/common/hi_res_timer_manager.h"
80 #include "chrome/common/json_pref_store.h" 81 #include "chrome/common/json_pref_store.h"
81 #include "chrome/common/jstemplate_builder.h" 82 #include "chrome/common/jstemplate_builder.h"
82 #include "chrome/common/logging_chrome.h" 83 #include "chrome/common/logging_chrome.h"
83 #include "chrome/common/main_function_params.h" 84 #include "chrome/common/main_function_params.h"
84 #include "chrome/common/net/net_resource_provider.h" 85 #include "chrome/common/net/net_resource_provider.h"
85 #include "chrome/common/pref_names.h" 86 #include "chrome/common/pref_names.h"
86 #include "chrome/common/result_codes.h" 87 #include "chrome/common/result_codes.h"
87 #include "chrome/installer/util/google_update_settings.h" 88 #include "chrome/installer/util/google_update_settings.h"
89 #include "gfx/gfx_module.h"
88 #include "grit/app_locale_settings.h" 90 #include "grit/app_locale_settings.h"
89 #include "grit/chromium_strings.h" 91 #include "grit/chromium_strings.h"
90 #include "grit/generated_resources.h" 92 #include "grit/generated_resources.h"
91 #include "net/base/cookie_monster.h" 93 #include "net/base/cookie_monster.h"
92 #include "net/base/net_module.h" 94 #include "net/base/net_module.h"
93 #include "net/base/network_change_notifier.h" 95 #include "net/base/network_change_notifier.h"
94 #include "net/http/http_network_layer.h" 96 #include "net/http/http_network_layer.h"
95 #include "net/http/http_stream_factory.h" 97 #include "net/http/http_stream_factory.h"
96 #include "net/socket/client_socket_pool_base.h" 98 #include "net/socket/client_socket_pool_base.h"
97 #include "net/socket/client_socket_pool_manager.h" 99 #include "net/socket/client_socket_pool_manager.h"
(...skipping 1402 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 app::win::ScopedCOMInitializer com_initializer; 1502 app::win::ScopedCOMInitializer com_initializer;
1501 1503
1502 #if defined(GOOGLE_CHROME_BUILD) 1504 #if defined(GOOGLE_CHROME_BUILD)
1503 // Init the RLZ library. This just binds the dll and schedules a task on the 1505 // Init the RLZ library. This just binds the dll and schedules a task on the
1504 // file thread to be run sometime later. If this is the first run we record 1506 // file thread to be run sometime later. If this is the first run we record
1505 // the installation event. 1507 // the installation event.
1506 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay); 1508 RLZTracker::InitRlzDelayed(is_first_run, master_prefs.ping_delay);
1507 #endif 1509 #endif
1508 #endif 1510 #endif
1509 1511
1510 // Configure the network module so it has access to resources. 1512 // Configure modules that need access to resources.
1511 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); 1513 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
1514 gfx::GfxModule::SetResourceProvider(chrome::GfxResourceProvider);
1512 1515
1513 // Register our global network handler for chrome:// and 1516 // Register our global network handler for chrome:// and
1514 // chrome-extension:// URLs. 1517 // chrome-extension:// URLs.
1515 RegisterURLRequestChromeJob(); 1518 RegisterURLRequestChromeJob();
1516 RegisterExtensionProtocols(); 1519 RegisterExtensionProtocols();
1517 RegisterMetadataURLRequestHandler(); 1520 RegisterMetadataURLRequestHandler();
1518 RegisterBlobURLRequestJobFactory(); 1521 RegisterBlobURLRequestJobFactory();
1519 1522
1520 // In unittest mode, this will do nothing. In normal mode, this will create 1523 // In unittest mode, this will do nothing. In normal mode, this will create
1521 // the global GoogleURLTracker and IntranetRedirectDetector instances, which 1524 // the global GoogleURLTracker and IntranetRedirectDetector instances, which
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1746 #if defined(OS_CHROMEOS) 1749 #if defined(OS_CHROMEOS)
1747 // To be precise, logout (browser shutdown) is not yet done, but the 1750 // To be precise, logout (browser shutdown) is not yet done, but the
1748 // remaining work is negligible, hence we say LogoutDone here. 1751 // remaining work is negligible, hence we say LogoutDone here.
1749 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1752 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1750 false); 1753 false);
1751 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1754 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1752 #endif 1755 #endif
1753 TRACE_EVENT_END("BrowserMain", 0, 0); 1756 TRACE_EVENT_END("BrowserMain", 0, 0);
1754 return result_code; 1757 return result_code;
1755 } 1758 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/native_theme_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698