summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/automation/automation_provider.cc15
-rw-r--r--chrome/browser/browser_init.cc3
-rw-r--r--chrome/test/unit/chrome_test_suite.h1
3 files changed, 0 insertions, 19 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 8a9be0d..30a52ff 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -2116,13 +2116,8 @@ void AutomationProvider::HandleFindRequest(
void AutomationProvider::HandleOpenFindInPageRequest(
const IPC::Message& message, int handle) {
if (browser_tracker_->ContainsHandle(handle)) {
-#if defined(OS_WIN)
Browser* browser = browser_tracker_->GetResource(handle);
browser->FindInPage(false, false);
-#else
- // TODO(port): Enable when Browser::FindInPage is ported.
- NOTIMPLEMENTED();
-#endif
}
}
@@ -2765,16 +2760,11 @@ void TestingAutomationProvider::OnRemoveProvider() {
void AutomationProvider::GetSSLInfoBarCount(int handle, int* count) {
*count = -1; // -1 means error.
-#if defined(OS_WIN)
if (tab_tracker_->ContainsHandle(handle)) {
NavigationController* nav_controller = tab_tracker_->GetResource(handle);
if (nav_controller)
*count = nav_controller->tab_contents()->infobar_delegate_count();
}
-#else
- // TODO(port): Enable when TabContents infobar related stuff is ported.
- NOTIMPLEMENTED();
-#endif
}
void AutomationProvider::ClickSSLInfoBarLink(int handle,
@@ -2782,7 +2772,6 @@ void AutomationProvider::ClickSSLInfoBarLink(int handle,
bool wait_for_navigation,
IPC::Message* reply_message) {
bool success = false;
-#if defined(OS_WIN)
if (tab_tracker_->ContainsHandle(handle)) {
NavigationController* nav_controller = tab_tracker_->GetResource(handle);
if (nav_controller) {
@@ -2801,10 +2790,6 @@ void AutomationProvider::ClickSSLInfoBarLink(int handle,
}
}
}
-#else
- // TODO(port): Enable when TabContents infobar related stuff is ported.
- NOTIMPLEMENTED();
-#endif
if (!wait_for_navigation || !success)
AutomationMsg_ClickSSLInfoBarLink::WriteReplyParams(reply_message,
success);
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 91900d0..ba95e1f 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -408,11 +408,8 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile,
net::CookieMonster::EnableFileScheme();
if (command_line_.HasSwitch(switches::kUserAgent)) {
-#if defined(OS_WIN)
webkit_glue::SetUserAgent(WideToUTF8(
command_line_.GetSwitchValue(switches::kUserAgent)));
- // TODO(port): hook this up when we bring in webkit.
-#endif
}
// Open the required browser windows and tabs.
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 421297c..b46a105 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -110,7 +110,6 @@ class ChromeTestSuite : public TestSuite {
}
virtual void Shutdown() {
- // TODO(port): Remove the #ifdef when ResourceBundle is ported.
ResourceBundle::CleanupSharedInstance();
#if defined(OS_MACOSX)