summaryrefslogtreecommitdiffstats
path: root/content/content_app.gypi
diff options
context:
space:
mode:
authormarshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 16:05:13 +0000
committermarshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-06 16:05:13 +0000
commit6f2b39bccfbb74a7633deff531a33f03efe9accf (patch)
tree4e27e58cc514dd3d553f790bb0ca299b33245e2c /content/content_app.gypi
parentb3cc0c25614566f1261b9c3759d6a076e327fd6c (diff)
downloadchromium_src-6f2b39bccfbb74a7633deff531a33f03efe9accf.zip
chromium_src-6f2b39bccfbb74a7633deff531a33f03efe9accf.tar.gz
chromium_src-6f2b39bccfbb74a7633deff531a33f03efe9accf.tar.bz2
Support sharing of ContentMain and BrowserMain code with embedded use cases.
For the browser use case it is convenient to have a single ContentMain entry point function that handles all initialization, run and shutdown. For embedded use cases it is often necessary to integrate with existing application message loops where initialization and shutdown must be handled separately. To support sharing of this code the following changes were required: 1. Refactor the ContentMain function to create a ContentMainRunner class containing separate initialization, run and shutdown functions. 2. Refactor the BrowserMain function and BrowserMainLoop class to create a BrowserMainRunner class containing separate initialization, run and shutdown functions. 3. Add a new BrowserMainParts::GetMainMessageLoop method. This is necessary to support creation of a custom MessageLoop implementation while sharing BrowserMainRunner initialization and shutdown code. BUG=112507 TEST=none Review URL: https://chromiumcodereview.appspot.com/9190018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_app.gypi')
-rw-r--r--content/content_app.gypi6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi
index baa5207..ad1cc83 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
@@ -14,9 +14,11 @@
],
'sources': [
'app/content_main.cc',
- 'app/content_main.h',
+ 'app/content_main_runner.cc',
'app/startup_helper_win.cc',
+ 'public/app/content_main.h',
'public/app/content_main_delegate.h',
+ 'public/app/content_main_runner.h',
'public/app/startup_helper_win.h',
],
'conditions': [