commit 268f998a3b4f638972aa33246cd8732a1317547e
author jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Nov 06 21:34:25 2009 +0000
committer jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Nov 06 21:34:25 2009 +0000
tree 63c9fe04a9808d7fb31f6a0d1d73f48c43a231c4
parent 9c7159c895fbfb91b0146bd0a321ee3f1d3751f7

Merge all platforms into a single XPI, changes the names to the latest name
of the plugin, adds code to compute the JS window of the calling code and
the top-level URL directly rather than relying on the value passed in, and
implements tab identity.

A side effect of the changes to compute window/URL is that FF1.5-2 are not
currently supported, though we may add it back in the future if there is demand
and we can find another way to do this.

Patch by: sgross, jat
Review by: jat, rice


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6742 8db76d5a-ed1c-0410-87a9-c151d255dfc7

plugins/xpcom/Preferences.cpp

diff --git a/plugins/xpcom/Preferences.cpp b/plugins/xpcom/Preferences.cpp
index 0951711..055200c 100644
--- a/plugins/xpcom/Preferences.cpp
+++ b/plugins/xpcom/Preferences.cpp
@@ -27,8 +27,8 @@
 #include "nsIPrefBranch2.h"
 #include "nsServiceManagerUtils.h"
 
-#define DMP_PREFS_PREFIX "gwt-dmp."
-#define DMP_ACCESS_LIST "accessList"
+#define GWT_DEV_PREFS_PREFIX "gwt-dev-plugin."
+#define GWT_DEV_ACCESS_LIST "accessList"
 
 NS_IMPL_ADDREF(Preferences)
 NS_IMPL_RELEASE(Preferences)
@@ -38,14 +38,15 @@
   nsCOMPtr<nsIPrefService> prefService = do_GetService(
       NS_PREFSERVICE_CONTRACTID);
   if (!prefService) {
-    Debug::log(Debug::Error) << "Unable to get preference service" << Debug::flush;
+    Debug::log(Debug::Error) << "Unable to get preference service"
+        << Debug::flush;
     return;
   }
   nsCOMPtr<nsIPrefBranch> branch;
-  prefService->GetBranch(DMP_PREFS_PREFIX, getter_AddRefs(branch));
+  prefService->GetBranch(GWT_DEV_PREFS_PREFIX, getter_AddRefs(branch));
   if (!branch) {
-    Debug::log(Debug::Error) << "Unable to get gwt-dmp. preference branch"
-        << Debug::flush;
+    Debug::log(Debug::Error) << "Unable to get " GWT_DEV_PREFS_PREFIX
+        " preference branch" << Debug::flush;
     return;
   }
   prefs = do_QueryInterface(branch);
@@ -53,9 +54,10 @@
     Debug::log(Debug::Error) << "Unable to get nsIPrefBranch2" << Debug::flush;
     return;
   }
-  prefs->AddObserver(DMP_ACCESS_LIST, this, PR_FALSE);
+  prefs->AddObserver(GWT_DEV_ACCESS_LIST, this, PR_FALSE);
   nsCString prefValue;
-  if (branch->GetCharPref(DMP_ACCESS_LIST, getter_Copies(prefValue)) == NS_OK) {
+  if (branch->GetCharPref(GWT_DEV_ACCESS_LIST, getter_Copies(prefValue))
+      == NS_OK) {
     loadAccessList(prefValue.get());
   }
 }
@@ -74,7 +76,8 @@
   nsCOMPtr<nsIPrefBranch> prefs(do_QueryInterface(aSubject, &rv));
   NS_ENSURE_SUCCESS(rv, rv);
   nsCString prefValue;
-  if (prefs->GetCharPref(DMP_ACCESS_LIST, getter_Copies(prefValue)) == NS_OK) {
+  if (prefs->GetCharPref(GWT_DEV_ACCESS_LIST, getter_Copies(prefValue))
+      == NS_OK) {
     loadAccessList(prefValue.get());
   }
   return NS_OK;
@@ -82,7 +85,8 @@
 
 void Preferences::addNewRule(const std::string& pattern, bool exclude) {
   nsCString prefValue;
-  if (prefs->GetCharPref(DMP_ACCESS_LIST, getter_Copies(prefValue)) != NS_OK) {
+  if (prefs->GetCharPref(GWT_DEV_ACCESS_LIST, getter_Copies(prefValue))
+      != NS_OK) {
     Debug::log(Debug::Error) << "Unable to retrieve access list preference"
         << Debug::flush;
     return;
@@ -96,7 +100,7 @@
     pref += '!';
   }
   pref += pattern;
-  if (prefs->SetCharPref(DMP_ACCESS_LIST, pref.c_str()) != NS_OK) {
+  if (prefs->SetCharPref(GWT_DEV_ACCESS_LIST, pref.c_str()) != NS_OK) {
     Debug::log(Debug::Error) << "Unable to save modified access list preference"
         << Debug::flush;
     return;
@@ -114,6 +118,6 @@
 
 Preferences::~Preferences() {
   if (prefs) {
-    prefs->RemoveObserver(DMP_ACCESS_LIST, this);
+    prefs->RemoveObserver(GWT_DEV_ACCESS_LIST, this);
   }
 }