Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Side by Side Diff: chrome/browser/ui/views/toolbar_view.cc

Issue 10580039: Adds ability to render omnibox as a view above the page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/toolbar_view.h" 5 #include "chrome/browser/ui/views/toolbar_view.h"
6 6
7 #include "base/i18n/number_formatting.h" 7 #include "base/i18n/number_formatting.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/event_disposition.h" 10 #include "chrome/browser/event_disposition.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED, 153 registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
154 content::Source<Profile>(browser_->profile())); 154 content::Source<Profile>(browser_->profile()));
155 } 155 }
156 156
157 ToolbarView::~ToolbarView() { 157 ToolbarView::~ToolbarView() {
158 // NOTE: Don't remove the command observers here. This object gets destroyed 158 // NOTE: Don't remove the command observers here. This object gets destroyed
159 // after the Browser (which owns the CommandUpdater), so the CommandUpdater is 159 // after the Browser (which owns the CommandUpdater), so the CommandUpdater is
160 // already gone. 160 // already gone.
161 } 161 }
162 162
163 void ToolbarView::Init() { 163 void ToolbarView::Init(views::View* popup_parent_view) {
164 back_menu_model_.reset(new BackForwardMenuModel( 164 back_menu_model_.reset(new BackForwardMenuModel(
165 browser_, BackForwardMenuModel::BACKWARD_MENU)); 165 browser_, BackForwardMenuModel::BACKWARD_MENU));
166 forward_menu_model_.reset(new BackForwardMenuModel( 166 forward_menu_model_.reset(new BackForwardMenuModel(
167 browser_, BackForwardMenuModel::FORWARD_MENU)); 167 browser_, BackForwardMenuModel::FORWARD_MENU));
168 back_ = new views::ButtonDropDown(this, back_menu_model_.get()); 168 back_ = new views::ButtonDropDown(this, back_menu_model_.get());
169 back_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | 169 back_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
170 ui::EF_MIDDLE_MOUSE_BUTTON); 170 ui::EF_MIDDLE_MOUSE_BUTTON);
171 back_->set_tag(IDC_BACK); 171 back_->set_tag(IDC_BACK);
172 back_->SetImageAlignment(views::ImageButton::ALIGN_RIGHT, 172 back_->SetImageAlignment(views::ImageButton::ALIGN_RIGHT,
173 views::ImageButton::ALIGN_TOP); 173 views::ImageButton::ALIGN_TOP);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 // Always add children in order from left to right, for accessibility. 232 // Always add children in order from left to right, for accessibility.
233 AddChildView(back_); 233 AddChildView(back_);
234 AddChildView(forward_); 234 AddChildView(forward_);
235 AddChildView(reload_); 235 AddChildView(reload_);
236 AddChildView(home_); 236 AddChildView(home_);
237 AddChildView(location_bar_); 237 AddChildView(location_bar_);
238 AddChildView(browser_actions_); 238 AddChildView(browser_actions_);
239 AddChildView(app_menu_); 239 AddChildView(app_menu_);
240 240
241 location_bar_->Init(); 241 location_bar_->Init(popup_parent_view);
242 show_home_button_.Init(prefs::kShowHomeButton, 242 show_home_button_.Init(prefs::kShowHomeButton,
243 browser_->profile()->GetPrefs(), this); 243 browser_->profile()->GetPrefs(), this);
244 browser_actions_->Init(); 244 browser_actions_->Init();
245 245
246 // Accessibility specific tooltip text. 246 // Accessibility specific tooltip text.
247 if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) { 247 if (BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser()) {
248 back_->SetTooltipText( 248 back_->SetTooltipText(
249 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK)); 249 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK));
250 forward_->SetTooltipText( 250 forward_->SetTooltipText(
251 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD)); 251 l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD));
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 accname_app = l10n_util::GetStringFUTF16( 820 accname_app = l10n_util::GetStringFUTF16(
821 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app); 821 IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
822 } 822 }
823 app_menu_->SetAccessibleName(accname_app); 823 app_menu_->SetAccessibleName(accname_app);
824 824
825 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL)); 825 app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
826 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT)); 826 app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
827 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED)); 827 app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
828 SchedulePaint(); 828 SchedulePaint();
829 } 829 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698