OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/views/compact_nav/compact_options_bar.h" | 5 #include "chrome/browser/ui/views/compact_nav/compact_options_bar.h" |
6 | 6 |
7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
8 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" | 8 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" |
9 #include "chrome/browser/ui/view_ids.h" | 9 #include "chrome/browser/ui/view_ids.h" |
10 #include "chrome/browser/ui/views/event_utils.h" | 10 #include "chrome/browser/ui/views/event_utils.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 | 42 |
43 wrench_menu_model_.reset(new WrenchMenuModel(this, browser_view_->browser())); | 43 wrench_menu_model_.reset(new WrenchMenuModel(this, browser_view_->browser())); |
44 | 44 |
45 app_menu_ = new views::MenuButton(NULL, std::wstring(), this, false); | 45 app_menu_ = new views::MenuButton(NULL, std::wstring(), this, false); |
46 app_menu_->set_border(NULL); | 46 app_menu_->set_border(NULL); |
47 app_menu_->EnableCanvasFlippingForRTLUI(true); | 47 app_menu_->EnableCanvasFlippingForRTLUI(true); |
48 app_menu_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP)); | 48 app_menu_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP)); |
49 app_menu_->SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16( | 49 app_menu_->SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16( |
50 IDS_APPMENU_TOOLTIP, | 50 IDS_APPMENU_TOOLTIP, |
51 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)))); | 51 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)))); |
52 app_menu_->SetID(VIEW_ID_APP_MENU); | 52 app_menu_->set_id(VIEW_ID_APP_MENU); |
53 AddChildView(app_menu_); | 53 AddChildView(app_menu_); |
54 | 54 |
55 LoadImages(); | 55 LoadImages(); |
56 } | 56 } |
57 | 57 |
58 void CompactOptionsBar::AddMenuListener(views::MenuListener* listener) { | 58 void CompactOptionsBar::AddMenuListener(views::MenuListener* listener) { |
59 menu_listeners_.push_back(listener); | 59 menu_listeners_.push_back(listener); |
60 } | 60 } |
61 | 61 |
62 void CompactOptionsBar::RemoveMenuListener(views::MenuListener* listener) { | 62 void CompactOptionsBar::RemoveMenuListener(views::MenuListener* listener) { |
(...skipping 22 matching lines...) Expand all Loading... |
85 | 85 |
86 gfx::Size button_size = app_menu_->GetPreferredSize(); | 86 gfx::Size button_size = app_menu_->GetPreferredSize(); |
87 app_menu_->SetBounds(kEndPadding, 0, button_size.width(), height()); | 87 app_menu_->SetBounds(kEndPadding, 0, button_size.width(), height()); |
88 } | 88 } |
89 | 89 |
90 //////////////////////////////////////////////////////////////////////////////// | 90 //////////////////////////////////////////////////////////////////////////////// |
91 // CompactOptionsBar, views::MenuDelegate implementation: | 91 // CompactOptionsBar, views::MenuDelegate implementation: |
92 | 92 |
93 void CompactOptionsBar::RunMenu(views::View* source, | 93 void CompactOptionsBar::RunMenu(views::View* source, |
94 const gfx::Point& /* pt */) { | 94 const gfx::Point& /* pt */) { |
95 DCHECK_EQ(VIEW_ID_APP_MENU, source->GetID()); | 95 DCHECK_EQ(VIEW_ID_APP_MENU, source->id()); |
96 | 96 |
97 wrench_menu_ = new WrenchMenu(browser_view_->browser()); | 97 wrench_menu_ = new WrenchMenu(browser_view_->browser()); |
98 wrench_menu_->Init(wrench_menu_model_.get()); | 98 wrench_menu_->Init(wrench_menu_model_.get()); |
99 | 99 |
100 for (size_t i = 0; i < menu_listeners_.size(); ++i) | 100 for (size_t i = 0; i < menu_listeners_.size(); ++i) |
101 menu_listeners_[i]->OnMenuOpened(); | 101 menu_listeners_[i]->OnMenuOpened(); |
102 | 102 |
103 // Note that this might be destroyed while the menu is running. | 103 // Note that this might be destroyed while the menu is running. |
104 wrench_menu_->RunMenu(app_menu_); | 104 wrench_menu_->RunMenu(app_menu_); |
105 } | 105 } |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 void CompactOptionsBar::LoadImages() { | 142 void CompactOptionsBar::LoadImages() { |
143 // Reuse the resources loaded for the Toolbar's AppMenu. | 143 // Reuse the resources loaded for the Toolbar's AppMenu. |
144 DCHECK(browser_view_->toolbar()); | 144 DCHECK(browser_view_->toolbar()); |
145 app_menu_->SetIcon(browser_view_->toolbar()->GetAppMenuIcon( | 145 app_menu_->SetIcon(browser_view_->toolbar()->GetAppMenuIcon( |
146 views::CustomButton::BS_NORMAL)); | 146 views::CustomButton::BS_NORMAL)); |
147 app_menu_->SetHoverIcon(browser_view_->toolbar()->GetAppMenuIcon( | 147 app_menu_->SetHoverIcon(browser_view_->toolbar()->GetAppMenuIcon( |
148 views::CustomButton::BS_HOT)); | 148 views::CustomButton::BS_HOT)); |
149 app_menu_->SetPushedIcon(browser_view_->toolbar()->GetAppMenuIcon( | 149 app_menu_->SetPushedIcon(browser_view_->toolbar()->GetAppMenuIcon( |
150 views::CustomButton::BS_PUSHED)); | 150 views::CustomButton::BS_PUSHED)); |
151 } | 151 } |
OLD | NEW |