summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_plugin_lib.cc4
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc6
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc
index 7fbca70..40a0c76 100644
--- a/chrome/common/chrome_plugin_lib.cc
+++ b/chrome/common/chrome_plugin_lib.cc
@@ -122,7 +122,7 @@ void ChromePluginLib::RegisterPluginsWithNPAPI() {
return;
// Note: we can only access the NPAPI list because the PluginService has done
// the locking for us. We should not touch it anywhere else.
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
NPAPI::PluginList::AddExtraPluginPath(path);
#else
// TODO(port): plugins not yet implemented
@@ -255,7 +255,7 @@ int ChromePluginLib::CP_Test(void* param) {
bool ChromePluginLib::Load() {
#if !defined(OS_WIN)
// TODO(port): plugins not yet implemented
- NOTIMPLEMENTED();
+ NOTIMPLEMENTED() << " -- gears loading code.";
return false;
#else
DCHECK(module_ == 0);
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 4690499..181d4b1 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -211,19 +211,19 @@ int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
// static
bool Upgrade::IsBrowserAlreadyRunning() {
- NOTIMPLEMENTED();
+ // http://code.google.com/p/chromium/issues/detail?id=9295
return false;
}
// static
bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) {
- NOTIMPLEMENTED();
+ // http://code.google.com/p/chromium/issues/detail?id=9295
return true;
}
// static
bool Upgrade::SwapNewChromeExeIfPresent() {
- NOTIMPLEMENTED();
+ // http://code.google.com/p/chromium/issues/detail?id=9295
return true;
}