| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/toolbar_view.h" | 5 #include "chrome/browser/views/toolbar_view.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/drag_drop_types.h" | 9 #include "app/drag_drop_types.h" |
| 10 #include "app/gfx/canvas.h" | 10 #include "app/gfx/canvas.h" |
| (...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 display_mode_ == DISPLAYMODE_LOCATION, | 861 display_mode_ == DISPLAYMODE_LOCATION, |
| 862 this); | 862 this); |
| 863 | 863 |
| 864 // The Go button. | 864 // The Go button. |
| 865 go_ = new GoButton(location_bar_, browser_); | 865 go_ = new GoButton(location_bar_, browser_); |
| 866 go_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_GO)); | 866 go_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_GO)); |
| 867 go_->SetID(VIEW_ID_GO_BUTTON); | 867 go_->SetID(VIEW_ID_GO_BUTTON); |
| 868 | 868 |
| 869 LoadCenterStackImages(); | 869 LoadCenterStackImages(); |
| 870 | 870 |
| 871 location_bar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_LOCATION)); |
| 871 AddChildView(location_bar_); | 872 AddChildView(location_bar_); |
| 872 location_bar_->Init(); | 873 location_bar_->Init(); |
| 873 AddChildView(go_); | 874 AddChildView(go_); |
| 874 } | 875 } |
| 875 | 876 |
| 876 void ToolbarView::CreateRightSideControls(Profile* profile) { | 877 void ToolbarView::CreateRightSideControls(Profile* profile) { |
| 877 page_menu_ = new views::MenuButton(NULL, std::wstring(), this, false); | 878 page_menu_ = new views::MenuButton(NULL, std::wstring(), this, false); |
| 878 page_menu_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_PAGE)); | 879 page_menu_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_PAGE)); |
| 879 page_menu_->SetTooltipText(l10n_util::GetString(IDS_PAGEMENU_TOOLTIP)); | 880 page_menu_->SetTooltipText(l10n_util::GetString(IDS_PAGEMENU_TOOLTIP)); |
| 880 page_menu_->SetID(VIEW_ID_PAGE_MENU); | 881 page_menu_->SetID(VIEW_ID_PAGE_MENU); |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 app_menu_contents_->AddItem(IDC_ABOUT, | 1102 app_menu_contents_->AddItem(IDC_ABOUT, |
| 1102 l10n_util::GetStringFUTF16( | 1103 l10n_util::GetStringFUTF16( |
| 1103 IDS_ABOUT, | 1104 IDS_ABOUT, |
| 1104 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); | 1105 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); |
| 1105 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); | 1106 app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); |
| 1106 app_menu_contents_->AddSeparator(); | 1107 app_menu_contents_->AddSeparator(); |
| 1107 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); | 1108 app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); |
| 1108 | 1109 |
| 1109 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); | 1110 app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get())); |
| 1110 } | 1111 } |
| OLD | NEW |