| 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 "chrome/browser/views/location_bar_view.h" | 5 #include "chrome/browser/views/location_bar_view.h" |
| 6 | 6 |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
| 10 #include "chrome/browser/alternate_nav_url_fetcher.h" | 10 #include "chrome/browser/alternate_nav_url_fetcher.h" |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 flags |= MK_MBUTTON; | 559 flags |= MK_MBUTTON; |
| 560 if (event.IsRightMouseButton()) | 560 if (event.IsRightMouseButton()) |
| 561 flags |= MK_RBUTTON; | 561 flags |= MK_RBUTTON; |
| 562 | 562 |
| 563 gfx::Point screen_point(event.location()); | 563 gfx::Point screen_point(event.location()); |
| 564 ConvertPointToScreen(this, &screen_point); | 564 ConvertPointToScreen(this, &screen_point); |
| 565 | 565 |
| 566 location_entry_->HandleExternalMsg(msg, flags, screen_point.ToPOINT()); | 566 location_entry_->HandleExternalMsg(msg, flags, screen_point.ToPOINT()); |
| 567 } | 567 } |
| 568 | 568 |
| 569 bool LocationBarView::GetAccessibleRole(VARIANT* role) { | 569 bool LocationBarView::GetAccessibleRole(AccessibilityTypes::Role* role) { |
| 570 DCHECK(role); | 570 DCHECK(role); |
| 571 | 571 |
| 572 role->vt = VT_I4; | 572 *role = AccessibilityTypes::ROLE_GROUPING; |
| 573 role->lVal = ROLE_SYSTEM_GROUPING; | |
| 574 return true; | 573 return true; |
| 575 } | 574 } |
| 576 | 575 |
| 577 // SelectedKeywordView ------------------------------------------------------- | 576 // SelectedKeywordView ------------------------------------------------------- |
| 578 | 577 |
| 579 // The background is drawn using ImagePainter3. This is the left/center/right | 578 // The background is drawn using ImagePainter3. This is the left/center/right |
| 580 // image names. | 579 // image names. |
| 581 static const int kBorderImages[] = { | 580 static const int kBorderImages[] = { |
| 582 IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L, | 581 IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L, |
| 583 IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C, | 582 IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C, |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1090 } | 1089 } |
| 1091 | 1090 |
| 1092 void LocationBarView::FocusSearch() { | 1091 void LocationBarView::FocusSearch() { |
| 1093 location_entry_->SetUserText(L"?"); | 1092 location_entry_->SetUserText(L"?"); |
| 1094 location_entry_->SetFocus(); | 1093 location_entry_->SetFocus(); |
| 1095 } | 1094 } |
| 1096 | 1095 |
| 1097 void LocationBarView::SaveStateToContents(TabContents* contents) { | 1096 void LocationBarView::SaveStateToContents(TabContents* contents) { |
| 1098 location_entry_->SaveStateToTab(contents); | 1097 location_entry_->SaveStateToTab(contents); |
| 1099 } | 1098 } |
| OLD | NEW |