OLD | NEW |
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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/i18n/number_formatting.h" | 10 #include "base/i18n/number_formatting.h" |
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 app_menu_button_->ShowMenu(false); // Not for drop. | 402 app_menu_button_->ShowMenu(false); // Not for drop. |
403 } | 403 } |
404 | 404 |
405 //////////////////////////////////////////////////////////////////////////////// | 405 //////////////////////////////////////////////////////////////////////////////// |
406 // ToolbarView, LocationBarView::Delegate implementation: | 406 // ToolbarView, LocationBarView::Delegate implementation: |
407 | 407 |
408 WebContents* ToolbarView::GetWebContents() { | 408 WebContents* ToolbarView::GetWebContents() { |
409 return browser_->tab_strip_model()->GetActiveWebContents(); | 409 return browser_->tab_strip_model()->GetActiveWebContents(); |
410 } | 410 } |
411 | 411 |
| 412 const WebContents* ToolbarView::GetWebContents() const { |
| 413 return browser_->tab_strip_model()->GetActiveWebContents(); |
| 414 } |
| 415 |
412 ToolbarModel* ToolbarView::GetToolbarModel() { | 416 ToolbarModel* ToolbarView::GetToolbarModel() { |
413 return browser_->toolbar_model(); | 417 return browser_->toolbar_model(); |
414 } | 418 } |
415 | 419 |
416 const ToolbarModel* ToolbarView::GetToolbarModel() const { | 420 const ToolbarModel* ToolbarView::GetToolbarModel() const { |
417 return browser_->toolbar_model(); | 421 return browser_->toolbar_model(); |
418 } | 422 } |
419 | 423 |
420 ContentSettingBubbleModelDelegate* | 424 ContentSettingBubbleModelDelegate* |
421 ToolbarView::GetContentSettingBubbleModelDelegate() { | 425 ToolbarView::GetContentSettingBubbleModelDelegate() { |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 if (OutdatedUpgradeBubbleView::IsAvailable()) { | 786 if (OutdatedUpgradeBubbleView::IsAvailable()) { |
783 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, | 787 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, |
784 auto_update_enabled); | 788 auto_update_enabled); |
785 } | 789 } |
786 } | 790 } |
787 | 791 |
788 void ToolbarView::OnShowHomeButtonChanged() { | 792 void ToolbarView::OnShowHomeButtonChanged() { |
789 Layout(); | 793 Layout(); |
790 SchedulePaint(); | 794 SchedulePaint(); |
791 } | 795 } |
OLD | NEW |