summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 20:53:07 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 20:53:07 +0000
commitc56f820bfbad49ad02710292034d0f1c7184c619 (patch)
treed69e76553bbe3b5a2cfd8fe0dcd52cdfd3711914 /chrome/browser
parent464fdb3e6c72c3a0ddc546c0f2b9607b087997a2 (diff)
downloadchromium_src-c56f820bfbad49ad02710292034d0f1c7184c619.zip
chromium_src-c56f820bfbad49ad02710292034d0f1c7184c619.tar.gz
chromium_src-c56f820bfbad49ad02710292034d0f1c7184c619.tar.bz2
Implement focusing location bar with cmd-L on mac. Removes some more platform ifdefs that are no longer necessary in Browser. Patch from thakis@google.com.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser.cc4
-rw-r--r--chrome/browser/browser.h2
2 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 0ecc721..ff5f52e 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -905,7 +905,6 @@ void Browser::FocusToolbar() {
}
#endif
-#if defined(OS_WIN) || defined(OS_LINUX)
void Browser::FocusLocationBar() {
UserMetrics::RecordAction(L"FocusLocation", profile_);
window_->SetFocusToLocationBar();
@@ -916,7 +915,6 @@ void Browser::FocusSearch() {
UserMetrics::RecordAction(L"FocusSearch", profile_);
window_->GetLocationBar()->FocusSearch();
}
-#endif
#if defined(OS_WIN) || defined(OS_LINUX)
void Browser::OpenFile() {
@@ -1229,10 +1227,8 @@ void Browser::ExecuteCommand(int id) {
#if defined(OS_WIN)
case IDC_FOCUS_TOOLBAR: FocusToolbar(); break;
#endif
-#if defined(OS_WIN) || defined(OS_LINUX)
case IDC_FOCUS_LOCATION: FocusLocationBar(); break;
case IDC_FOCUS_SEARCH: FocusSearch(); break;
-#endif
// Show various bits of UI
#if defined(OS_WIN)|| defined(OS_LINUX)
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 9bf94b0..17d11d7 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -312,10 +312,8 @@ class Browser : public TabStripModelDelegate,
// Focus various bits of UI
void FocusToolbar();
#endif
-#if defined(OS_WIN) || defined(OS_LINUX)
void FocusLocationBar();
void FocusSearch();
-#endif
// Show various bits of UI
#if defined(OS_WIN) || defined(OS_LINUX)