Various minor extension fixes

chrome/renderer/user_script_slave.cc

 // Copyright (c) 2009 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 "chrome/renderer/user_script_slave.h"
 
 #include "app/resource_bundle.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/perftimer.h"
@@ skipping 15 matching lines @@
 static const char kUserScriptTail[] = "\n})(window);";
 
 // Creates a convenient reference to a content script's parent extension.
 static const char kInitExtension[] =
     "chrome.extension = new chrome.Extension('%s')";
 
 UserScriptSlave::UserScriptSlave()
     : shared_memory_(NULL),
       script_deleter_(&scripts_),
       user_script_start_line_(0) {
-  // TODO: Only windows supports resources and only windows supports user
-  // scrips, so only load the Greasemonkey API on windows.  Fix this when
-  // better cross platofrm support is available.
-#if defined(OS_WIN)
   api_js_ = ResourceBundle::GetSharedInstance().GetRawDataResource(
                 IDR_GREASEMONKEY_API_JS);
-#endif
 
   // Count the number of lines that will be injected before the user script.
   StringPiece::size_type pos = 0;
   while ((pos = api_js_.find('\n', pos)) != StringPiece::npos) {
     user_script_start_line_++;
     pos++;
   }
 
   // NOTE: There is actually one extra line in the injected script because the
   // function header includes a newline as well. But WebKit expects the
@@ skipping 51 matching lines @@
       script->css_scripts()[j].set_external_content(
           StringPiece(body, body_length));
     }
   }
 
   return true;
 }
 
 bool UserScriptSlave::InjectScripts(WebFrame* frame,
                                     UserScript::RunLocation location) {
+  // Don't bother if this is not a URL we inject script into.
+  if (!URLPattern::IsValidScheme(frame->GetURL().scheme()))
+    return true;
+
   PerfTimer timer;
   int num_matched = 0;
 
   for (size_t i = 0; i < scripts_.size(); ++i) {
     std::vector<WebScriptSource> sources;
     UserScript* script = scripts_[i];
     if (!script->MatchesUrl(frame->GetURL()))
       continue;  // This frame doesn't match the script url pattern, skip it.
 
     ++num_matched;
@@ skipping 44 matching lines @@
     HISTOGRAM_TIMES("UserScripts:DocStart:Time", timer.Elapsed());
   } else {
     HISTOGRAM_COUNTS_100("UserScripts:DocEnd:Count", num_matched);
     HISTOGRAM_TIMES("UserScripts:DocEnd:Time", timer.Elapsed());
   }
 
   LOG(INFO) << "Injected " << num_matched << " user scripts into " <<
       frame->GetURL().spec();
   return true;
 }