diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 7 | ||||
| -rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index eb165e1..dd1a07b 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1395,7 +1395,9 @@ void AutomationProvider::GetBookmarkBarVisibility(int handle, if (browser_tracker_->ContainsHandle(handle)) { Browser* browser = browser_tracker_->GetResource(handle); if (browser) { -#if 0 // defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#if 0 // defined(TOOLKIT_VIEWS) && defined(OS_LINUX) + // TODO(jrg): Was removed in rev43789 for perf. Need to investigate. + // IsBookmarkBarVisible() line looks correct but is not // consistent across platforms. Specifically, on Mac/Linux, it // returns false if the bar is hidden in a pref (even if visible @@ -3300,7 +3302,8 @@ void AutomationProvider::GetEnabledExtensions( for (size_t i = 0; i < extensions->size(); ++i) { Extension* extension = (*extensions)[i]; DCHECK(extension); - if (extension->location() == Extension::INTERNAL) { + if (extension->location() == Extension::INTERNAL || + extension->location() == Extension::LOAD) { result->push_back(extension->path()); } } diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index ee725c8..4c0dafa 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -1167,12 +1167,11 @@ IPC_BEGIN_MESSAGES(Automation) // Retrieves a list of the root directories of all enabled extensions // that have been installed into Chrome by dropping a .crx file onto - // Chrome or an equivalent action. Other types of extensions are not - // included on the list (e.g. "component" extensions, "external" - // extensions or extensions loaded via --load-extension since the first - // two are generally not useful for testing (e.g. an external extension - // could mess with an automated test if it's present on some systems only) - // and the last would generally be explicitly loaded by tests. + // Chrome or an equivalent action (including loaded extensions). + // Other types of extensions are not included on the list (e.g. "component" + // or "external" extensions) since they are generally not useful for testing + // (e.g. an external extension could mess with an automated test if it's + // present on some systems only). IPC_SYNC_MESSAGE_ROUTED0_1(AutomationMsg_GetEnabledExtensions, std::vector<FilePath>) |