| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/views/location_bar/location_bar_view.h" | 5 #include "chrome/browser/views/location_bar/location_bar_view.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 914 } | 914 } |
| 915 | 915 |
| 916 #if defined(OS_WIN) | 916 #if defined(OS_WIN) |
| 917 return location_entry_->SkipDefaultKeyEventProcessing(e); | 917 return location_entry_->SkipDefaultKeyEventProcessing(e); |
| 918 #else | 918 #else |
| 919 // TODO(jcampan): We need to refactor the code of | 919 // TODO(jcampan): We need to refactor the code of |
| 920 // AutocompleteEditViewWin::SkipDefaultKeyEventProcessing into this class so | 920 // AutocompleteEditViewWin::SkipDefaultKeyEventProcessing into this class so |
| 921 // it can be shared between Windows and Linux. | 921 // it can be shared between Windows and Linux. |
| 922 // For now, we just override back-space and tab keys, as back-space is the | 922 // For now, we just override back-space and tab keys, as back-space is the |
| 923 // accelerator for back navigation and tab key is used by some input methods. | 923 // accelerator for back navigation and tab key is used by some input methods. |
| 924 if (e.GetKeyCode() == base::VKEY_BACK || | 924 if (e.GetKeyCode() == app::VKEY_BACK || |
| 925 views::FocusManager::IsTabTraversalKeyEvent(e)) | 925 views::FocusManager::IsTabTraversalKeyEvent(e)) |
| 926 return true; | 926 return true; |
| 927 return false; | 927 return false; |
| 928 #endif | 928 #endif |
| 929 } | 929 } |
| 930 | 930 |
| 931 bool LocationBarView::GetAccessibleRole(AccessibilityTypes::Role* role) { | 931 bool LocationBarView::GetAccessibleRole(AccessibilityTypes::Role* role) { |
| 932 DCHECK(role); | 932 DCHECK(role); |
| 933 | 933 |
| 934 *role = AccessibilityTypes::ROLE_GROUPING; | 934 *role = AccessibilityTypes::ROLE_GROUPING; |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1062 | 1062 |
| 1063 NOTREACHED(); | 1063 NOTREACHED(); |
| 1064 } | 1064 } |
| 1065 | 1065 |
| 1066 void LocationBarView::OnTemplateURLModelChanged() { | 1066 void LocationBarView::OnTemplateURLModelChanged() { |
| 1067 template_url_model_->RemoveObserver(this); | 1067 template_url_model_->RemoveObserver(this); |
| 1068 template_url_model_ = NULL; | 1068 template_url_model_ = NULL; |
| 1069 ShowFirstRunBubble(bubble_type_); | 1069 ShowFirstRunBubble(bubble_type_); |
| 1070 } | 1070 } |
| 1071 | 1071 |
| OLD | NEW |