diff options
| author | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 01:44:18 +0000 |
|---|---|---|
| committer | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 01:44:18 +0000 |
| commit | 6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c (patch) | |
| tree | 9e11c3d5fff2ac4409785dd26ff0850289af659b /chrome/app/chrome_main_delegate.h | |
| parent | 2bd16e7105e0c764d2c23f29d7cad9e8e6ac5ee4 (diff) | |
| download | chromium_src-6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c.zip chromium_src-6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c.tar.gz chromium_src-6313bb0014b49cbf7bd341d2b6da067ba1fa4d5c.tar.bz2 | |
Revert "Revert 155950 - Add initial Chromium TestShell support for Android"
Fixed build breakages:
-Had to add DEPS file for testshell/java.
-Something changed with ant from the time I tested and the time my CL got committed. Had to move
sdk-targets.xml import in the ant file to the end of the file.
This reverts commit 2d30dc03dc0bd0723236c549313774119f163056.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10905209
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_delegate.h')
| -rw-r--r-- | chrome/app/chrome_main_delegate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h index 3670dd5..53b3827 100644 --- a/chrome/app/chrome_main_delegate.h +++ b/chrome/app/chrome_main_delegate.h @@ -16,7 +16,7 @@ class ChromeMainDelegate : public content::ContentMainDelegate { ChromeMainDelegate(); virtual ~ChromeMainDelegate(); - private: + protected: // content::ContentMainDelegate implementation: virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; virtual void PreSandboxStartup() OVERRIDE; |