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

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

Issue 2731283009: Swap ownership of RulesetService and the content delegate (Closed)
Patch Set: Swap ownership of RulesetService and the content delegate Created 3 years, 9 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 // Start the tab manager here so that we give the most amount of time for the 1366 // Start the tab manager here so that we give the most amount of time for the
1367 // other services to start up before we start adjusting the oom priority. 1367 // other services to start up before we start adjusting the oom priority.
1368 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) 1368 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
1369 g_browser_process->GetTabManager()->Start(); 1369 g_browser_process->GetTabManager()->Start();
1370 #endif 1370 #endif
1371 1371
1372 // The RulesetService will make the filtering rules available to renderers 1372 // The RulesetService will make the filtering rules available to renderers
1373 // immediately after its construction, provided that the rules are already 1373 // immediately after its construction, provided that the rules are already
1374 // available at no cost in an indexed format. This enables activating 1374 // available at no cost in an indexed format. This enables activating
1375 // subresource filtering, if needed, also for page loads on start-up. 1375 // subresource filtering, if needed, also for page loads on start-up.
1376 g_browser_process->subresource_filter_ruleset_service(); 1376 g_browser_process->subresource_filter_ruleset_service_delegate();
1377 } 1377 }
1378 1378
1379 void ChromeBrowserMainParts::PostBrowserStart() { 1379 void ChromeBrowserMainParts::PostBrowserStart() {
1380 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostBrowserStart"); 1380 TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostBrowserStart");
1381 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) 1381 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
1382 chrome_extra_parts_[i]->PostBrowserStart(); 1382 chrome_extra_parts_[i]->PostBrowserStart();
1383 #if !defined(OS_ANDROID) 1383 #if !defined(OS_ANDROID)
1384 // Allow ProcessSingleton to process messages. 1384 // Allow ProcessSingleton to process messages.
1385 process_singleton_->Unlock(); 1385 process_singleton_->Unlock();
1386 #endif // !defined(OS_ANDROID) 1386 #endif // !defined(OS_ANDROID)
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
2107 chromeos::CrosSettings::Shutdown(); 2107 chromeos::CrosSettings::Shutdown();
2108 #endif // defined(OS_CHROMEOS) 2108 #endif // defined(OS_CHROMEOS)
2109 #endif // defined(OS_ANDROID) 2109 #endif // defined(OS_ANDROID)
2110 } 2110 }
2111 2111
2112 // Public members: 2112 // Public members:
2113 2113
2114 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 2114 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
2115 chrome_extra_parts_.push_back(parts); 2115 chrome_extra_parts_.push_back(parts);
2116 } 2116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698