diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 22:15:09 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 22:15:09 +0000 |
| commit | b9eb8b20e029cf288b36da336e4c5611c9a65a55 (patch) | |
| tree | 4134579298bc01ebbedc060f511caa40902a8d84 /chrome/common | |
| parent | c3265d8866e5b0d2c1b129e4da685755a35a84b2 (diff) | |
| download | chromium_src-b9eb8b20e029cf288b36da336e4c5611c9a65a55.zip chromium_src-b9eb8b20e029cf288b36da336e4c5611c9a65a55.tar.gz chromium_src-b9eb8b20e029cf288b36da336e4c5611c9a65a55.tar.bz2 | |
Revert 56600 - ServiceProcessControlBrowserTest.LaunchAndIPC crashes.
Start/stop service process when browser starts and stop
Save the information that the setup of remoting has completed.
After setup has been completed we start and stop service process when
--enable-remoting presents when browser starts.
Also save the information in the service process that host is registered
and ready to be used. Again start chromoting host automatically once
the host registration is done.
Review URL: http://codereview.chromium.org/3185015
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/3107024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/pref_names.cc | 5 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index 16aa70e..02f92424 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -914,8 +914,6 @@ const char kLoginDatabaseMigrated[] = "login_database.migrated"; // The root URL of the cloud print service. const char kCloudPrintServiceURL[] = "cloud_print.service_url"; -const char kRemotingHasSetupCompleted[] = "remoting.has_setup_completed"; - // The list of BackgroundContents that should be loaded when the browser // launches. const char kRegisteredBackgroundContents[] = "background_contents.registered"; @@ -937,9 +935,6 @@ extern const char kCloudPrintEmail[] = "cloud_print.email"; extern const char kCloudPrintPrintSystemSettings[] = "cloud_print.print_system_settings"; -// Used by the service process to determine if the remoting host is enabled. -const char kRemotingHostEnabled[] = "remoting.host_enabled"; - // Boolean to disable proxy altogether. If true, other proxy // preferences are ignored. const char kNoProxyServer[] = "proxy.disabled"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 58d5741..18503a0 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -353,9 +353,6 @@ extern const char kCloudPrintXMPPAuthToken[]; extern const char kCloudPrintEmail[]; extern const char kCloudPrintPrintSystemSettings[]; -extern const char kRemotingHasSetupCompleted[]; -extern const char kRemotingHostEnabled[]; - extern const char kNoProxyServer[]; extern const char kProxyAutoDetect[]; extern const char kProxyServer[]; |