| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <windows.h> | 5 #include <windows.h> |
| 6 #include <shellapi.h> | 6 #include <shellapi.h> |
| 7 | 7 |
| 8 #include "chrome/browser/browser.h" | 8 #include "chrome/browser/browser.h" |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 889 void Browser::FocusToolbar() { | 889 void Browser::FocusToolbar() { |
| 890 UserMetrics::RecordAction(L"FocusToolbar", profile_); | 890 UserMetrics::RecordAction(L"FocusToolbar", profile_); |
| 891 window_->FocusToolbar(); | 891 window_->FocusToolbar(); |
| 892 } | 892 } |
| 893 | 893 |
| 894 void Browser::FocusLocationBar() { | 894 void Browser::FocusLocationBar() { |
| 895 UserMetrics::RecordAction(L"FocusLocation", profile_); | 895 UserMetrics::RecordAction(L"FocusLocation", profile_); |
| 896 LocationBarView* lbv = GetLocationBarView(); | 896 LocationBarView* lbv = GetLocationBarView(); |
| 897 if (lbv) { | 897 if (lbv) { |
| 898 AutocompleteEditView* aev = lbv->location_entry(); | 898 AutocompleteEditView* aev = lbv->location_entry(); |
| 899 aev->SetFocus(); | 899 if (aev->IsSelectAll()) { |
| 900 aev->SelectAll(true); | 900 aev->DeSelectAll(); |
| 901 GetSelectedTabContents()->Focus(); |
| 902 } else { |
| 903 aev->SetFocus(); |
| 904 aev->SelectAll(true); |
| 905 } |
| 901 } | 906 } |
| 902 } | 907 } |
| 903 | 908 |
| 904 void Browser::FocusSearch() { | 909 void Browser::FocusSearch() { |
| 905 // TODO(beng): replace this with FocusLocationBar | 910 // TODO(beng): replace this with FocusLocationBar |
| 906 UserMetrics::RecordAction(L"FocusSearch", profile_); | 911 UserMetrics::RecordAction(L"FocusSearch", profile_); |
| 907 LocationBarView* lbv = GetLocationBarView(); | 912 LocationBarView* lbv = GetLocationBarView(); |
| 908 if (lbv) { | 913 if (lbv) { |
| 909 AutocompleteEditView* aev = lbv->location_entry(); | 914 AutocompleteEditView* aev = lbv->location_entry(); |
| 910 aev->SetUserText(L"?"); | 915 aev->SetUserText(L"?"); |
| (...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2383 | 2388 |
| 2384 // We need to register the window position pref. | 2389 // We need to register the window position pref. |
| 2385 std::wstring window_pref(prefs::kBrowserWindowPlacement); | 2390 std::wstring window_pref(prefs::kBrowserWindowPlacement); |
| 2386 window_pref.append(L"_"); | 2391 window_pref.append(L"_"); |
| 2387 window_pref.append(app_name); | 2392 window_pref.append(app_name); |
| 2388 PrefService* prefs = g_browser_process->local_state(); | 2393 PrefService* prefs = g_browser_process->local_state(); |
| 2389 DCHECK(prefs); | 2394 DCHECK(prefs); |
| 2390 | 2395 |
| 2391 prefs->RegisterDictionaryPref(window_pref.c_str()); | 2396 prefs->RegisterDictionaryPref(window_pref.c_str()); |
| 2392 } | 2397 } |
| OLD | NEW |