Make GTK and Aura parts orthogonal to OS parts

content/browser/browser_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_main.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 149 matching lines @@
                       GLibLogHandler,
                       NULL);
   }
 }
 #endif
 
 }  // namespace
 
 namespace content {
 
+// BrowserParts
+
+BrowserParts::~BrowserParts() {
+}
+
+void BrowserParts::PreEarlyInitialization() {
+}
+
+void BrowserParts::PostEarlyInitialization() {
+}
+
+void BrowserParts::PreMainMessageLoopStart() {
+}
+
+void BrowserParts::PostMainMessageLoopStart() {
+}
+
+void BrowserParts::PreMainMessageLoopRun() {
+}
+
+void BrowserParts::PostMainMessageLoopRun() {
+}
+
+// BrowserMainParts
+
 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters)
     : parameters_(parameters),
       parsed_command_line_(parameters.command_line_),
       result_code_(content::RESULT_CODE_NORMAL_EXIT) {
 #if defined(OS_WIN)
   OleInitialize(NULL);
 #endif
 }
 
 BrowserMainParts::~BrowserMainParts() {
+  // Destroy added parts in reverse order.
+  for (PartsList::reverse_iterator riter = added_parts_.rbegin();
+       riter != added_parts_.rend(); ++riter) {
+    delete *riter;
+  }
+  added_parts_.clear();
+
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
+void BrowserMainParts::AddParts(BrowserParts* parts) {
+  added_parts_.push_back(parts);
+}
+
 void BrowserMainParts::EarlyInitialization() {
   PreEarlyInitialization();
+  for (PartsList::iterator iter = added_parts_.begin();
+       iter != added_parts_.end(); ++iter) {
+    (*iter)->PreEarlyInitialization();
+  }
+
+  // Start watching for jank during shutdown. It gets disarmed when
 
 #if defined(OS_WIN)
   net::EnsureWinsockInit();
 #endif
 
   // Use NSS for SSL by default.
   // The default client socket factory uses NSS for SSL by default on
   // Windows and Mac.
 #if defined(OS_WIN) || defined(OS_MACOSX)
   if (parsed_command_line().HasSwitch(switches::kUseSystemSSL)) {
@@ skipping 22 matching lines @@
           switches::kEnableDNSCertProvenanceChecking)) {
     net::SSLConfigService::EnableDNSCertProvenanceChecking();
   }
 
   // TODO(abarth): Should this move to InitializeNetworkOptions?  This doesn't
   // seem dependent on SSL initialization().
   if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen))
     net::set_tcp_fastopen_enabled(true);
 
   PostEarlyInitialization();
+  for (PartsList::iterator iter = added_parts_.begin();
+       iter != added_parts_.end(); ++iter) {
+    (*iter)->PostEarlyInitialization();
+  }
 }
 
 void BrowserMainParts::MainMessageLoopStart() {
   PreMainMessageLoopStart();
+  for (PartsList::iterator iter = added_parts_.begin();
+       iter != added_parts_.end(); ++iter) {
+    (*iter)->PreMainMessageLoopStart();
+  }
 
 #if defined(OS_WIN)
   // If we're running tests (ui_task is non-null), then the ResourceBundle
   // has already been initialized.
   if (!parameters().ui_task) {
     // Override the configured locale with the user's preferred UI language.
     l10n_util::OverrideLocaleWithUILanguageList();
   }
 #endif
 
   main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
 
   InitializeMainThread();
 
   system_monitor_.reset(new base::SystemMonitor);
   hi_res_timer_manager_.reset(new HighResolutionTimerManager);
 
   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
 
   PostMainMessageLoopStart();
+  for (PartsList::iterator iter = added_parts_.begin();
+       iter != added_parts_.end(); ++iter) {
+    (*iter)->PostMainMessageLoopStart();
+  }
 }
 
 static bool g_exited_main_message_loop = false;
 
 void BrowserMainParts::RunMainMessageLoopParts() {
   PreMainMessageLoopRun();
+  for (PartsList::iterator iter = added_parts_.begin();
+       iter != added_parts_.end(); ++iter) {
+    (*iter)->PreMainMessageLoopRun();
+  }
 
   TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
   // If the UI thread blocks, the whole UI is unresponsive.
   // Do not allow disk IO from the UI thread.
   base::ThreadRestrictions::SetIOAllowed(false);
   MainMessageLoopRun();
   TRACE_EVENT_END_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
 
   g_exited_main_message_loop = true;
 
   PostMainMessageLoopRun();
+  for (PartsList::iterator iter = added_parts_.begin();
+       iter != added_parts_.end(); ++iter) {
+    (*iter)->PostMainMessageLoopRun();
+  }
 }
 
 void BrowserMainParts::InitializeMainThread() {
   const char* kThreadName = "CrBrowserMain";
   base::PlatformThread::SetName(kThreadName);
   main_message_loop().set_thread_name(kThreadName);
 
 #if defined(TRACK_ALL_TASK_OBJECTS)
   tracked_objects::ThreadData::InitializeThreadContext(kThreadName);
 #endif  // TRACK_ALL_TASK_OBJECTS
 
   // Register the main thread by instantiating it, but don't call any methods.
   main_thread_.reset(new BrowserThread(BrowserThread::UI,
                                        MessageLoop::current()));
 }
 
 void BrowserMainParts::InitializeToolkit() {
   // TODO(evan): this function is rather subtle, due to the variety
   // of intersecting ifdefs we have.  To keep it easy to follow, there
   // are no #else branches on any #ifs.
-
+  // TODO(stevenjb): Move platform specific code into platform specific Parts
+  // (Need to add InitializeToolkit stage to BrowserParts).
 #if defined(OS_LINUX)
   // We want to call g_thread_init(), but in some codepaths (tests) it
   // is possible it has already been called.  In older versions of
   // GTK, it is an error to call g_thread_init twice; unfortunately,
   // the API to tell whether it has been called already was also only
   // added in a newer version of GTK!  Thankfully, this non-intuitive
   // check is actually equivalent and sufficient to work around the
   // error.
   if (!g_thread_supported())
     g_thread_init(NULL);
@@ skipping 25 matching lines @@
   INITCOMMONCONTROLSEX config;
   config.dwSize = sizeof(config);
   config.dwICC = ICC_WIN95_CLASSES;
   if (!InitCommonControlsEx(&config))
     LOG_GETLASTERROR(FATAL);
 #endif
 
   ToolkitInitialized();
 }
 
-void BrowserMainParts::PreEarlyInitialization() {
-}
-
-void BrowserMainParts::PostEarlyInitialization() {
-}
-
-void BrowserMainParts::PreMainMessageLoopStart() {
-}
-
-void BrowserMainParts::PostMainMessageLoopStart() {
-}
-
-void BrowserMainParts::PreMainMessageLoopRun() {
-}
+// BrowserMainParts implementation
 
 void BrowserMainParts::MainMessageLoopRun() {
   if (parameters().ui_task)
     MessageLoopForUI::current()->PostTask(FROM_HERE, parameters().ui_task);
 
 #if defined(OS_MACOSX)
   MessageLoopForUI::current()->Run();
 #else
   MessageLoopForUI::current()->Run(NULL);
 #endif
 }
 
-void BrowserMainParts::PostMainMessageLoopRun() {
-}
-
 void BrowserMainParts::ToolkitInitialized() {
 }
 
 bool ExitedMainMessageLoop() {
   return g_exited_main_message_loop;
 }
 
 }  // namespace content
 
 // Main routine for running as the Browser process.
@@ skipping 57 matching lines @@
   base::win::ScopedCOMInitializer com_initializer;
 #endif  // OS_WIN
 
   base::StatisticsRecorder statistics;
 
   parts->RunMainMessageLoopParts();
 
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return parts->result_code();
 }