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

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

Issue 324393002: Extension Toolbar redesign, part 1 (overflow) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missing gypi change Created 6 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/toolbar_view.h" 5 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/i18n/number_formatting.h" 9 #include "base/i18n/number_formatting.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 218
219 home_ = new HomeButton(this, browser_); 219 home_ = new HomeButton(this, browser_);
220 home_->set_triggerable_event_flags( 220 home_->set_triggerable_event_flags(
221 ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON); 221 ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON);
222 home_->set_tag(IDC_HOME); 222 home_->set_tag(IDC_HOME);
223 home_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_HOME)); 223 home_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_HOME));
224 home_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_HOME)); 224 home_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_HOME));
225 home_->set_id(VIEW_ID_HOME_BUTTON); 225 home_->set_id(VIEW_ID_HOME_BUTTON);
226 home_->Init(); 226 home_->Init();
227 227
228 browser_actions_ = new BrowserActionsContainer(browser_, this); 228 browser_actions_ = new BrowserActionsContainer(
229 browser_,
230 this, // Owner.
231 NULL); // No master container for this one (it is master).
229 232
230 app_menu_ = new WrenchToolbarButton(this); 233 app_menu_ = new WrenchToolbarButton(this);
231 app_menu_->EnableCanvasFlippingForRTLUI(true); 234 app_menu_->EnableCanvasFlippingForRTLUI(true);
232 app_menu_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP)); 235 app_menu_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP));
233 app_menu_->SetTooltipText(l10n_util::GetStringUTF16(IDS_APPMENU_TOOLTIP)); 236 app_menu_->SetTooltipText(l10n_util::GetStringUTF16(IDS_APPMENU_TOOLTIP));
234 app_menu_->set_id(VIEW_ID_APP_MENU); 237 app_menu_->set_id(VIEW_ID_APP_MENU);
235 238
236 // Always add children in order from left to right, for accessibility. 239 // Always add children in order from left to right, for accessibility.
237 AddChildView(back_); 240 AddChildView(back_);
238 AddChildView(forward_); 241 AddChildView(forward_);
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 841
839 void ToolbarView::OnShowHomeButtonChanged() { 842 void ToolbarView::OnShowHomeButtonChanged() {
840 Layout(); 843 Layout();
841 SchedulePaint(); 844 SchedulePaint();
842 } 845 }
843 846
844 int ToolbarView::content_shadow_height() const { 847 int ToolbarView::content_shadow_height() const {
845 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? 848 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
846 kContentShadowHeightAsh : kContentShadowHeight; 849 kContentShadowHeightAsh : kContentShadowHeight;
847 } 850 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc ('k') | chrome/browser/ui/views/toolbar/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698