| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "base/i18n/number_formatting.h" | 8 #include "base/i18n/number_formatting.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 use_new_menu = supports_new_separators; | 452 use_new_menu = supports_new_separators; |
| 453 #endif | 453 #endif |
| 454 #if defined(OS_WIN) | 454 #if defined(OS_WIN) |
| 455 use_new_menu = use_new_menu || ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; | 455 use_new_menu = use_new_menu || ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; |
| 456 #endif | 456 #endif |
| 457 | 457 |
| 458 wrench_menu_.reset(new WrenchMenu(browser_, use_new_menu, | 458 wrench_menu_.reset(new WrenchMenu(browser_, use_new_menu, |
| 459 supports_new_separators)); | 459 supports_new_separators)); |
| 460 wrench_menu_model_.reset(new WrenchMenuModel(this, browser_, use_new_menu, | 460 wrench_menu_model_.reset(new WrenchMenuModel(this, browser_, use_new_menu, |
| 461 supports_new_separators)); | 461 supports_new_separators)); |
| 462 wrench_menu_->Init(wrench_menu_model_.get()); | 462 wrench_menu_->Init(source, wrench_menu_model_.get()); |
| 463 | 463 |
| 464 FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened()); | 464 FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened()); |
| 465 | 465 |
| 466 wrench_menu_->RunMenu(app_menu_); | 466 wrench_menu_->RunMenu(app_menu_); |
| 467 } | 467 } |
| 468 | 468 |
| 469 //////////////////////////////////////////////////////////////////////////////// | 469 //////////////////////////////////////////////////////////////////////////////// |
| 470 // ToolbarView, LocationBarView::Delegate implementation: | 470 // ToolbarView, LocationBarView::Delegate implementation: |
| 471 | 471 |
| 472 WebContents* ToolbarView::GetWebContents() const { | 472 WebContents* ToolbarView::GetWebContents() const { |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 893 | 893 |
| 894 void ToolbarView::OnShowHomeButtonChanged() { | 894 void ToolbarView::OnShowHomeButtonChanged() { |
| 895 Layout(); | 895 Layout(); |
| 896 SchedulePaint(); | 896 SchedulePaint(); |
| 897 } | 897 } |
| 898 | 898 |
| 899 int ToolbarView::content_shadow_height() const { | 899 int ToolbarView::content_shadow_height() const { |
| 900 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? | 900 return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ? |
| 901 kContentShadowHeightAsh : kContentShadowHeight; | 901 kContentShadowHeightAsh : kContentShadowHeight; |
| 902 } | 902 } |
| OLD | NEW |