| 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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 | 414 |
| 415 const ToolbarModel* ToolbarView::GetToolbarModel() const { | 415 const ToolbarModel* ToolbarView::GetToolbarModel() const { |
| 416 return browser_->toolbar_model(); | 416 return browser_->toolbar_model(); |
| 417 } | 417 } |
| 418 | 418 |
| 419 ContentSettingBubbleModelDelegate* | 419 ContentSettingBubbleModelDelegate* |
| 420 ToolbarView::GetContentSettingBubbleModelDelegate() { | 420 ToolbarView::GetContentSettingBubbleModelDelegate() { |
| 421 return browser_->content_setting_bubble_model_delegate(); | 421 return browser_->content_setting_bubble_model_delegate(); |
| 422 } | 422 } |
| 423 | 423 |
| 424 void ToolbarView::ShowWebsiteSettings(content::WebContents* web_contents) { | 424 void ToolbarView::ShowPageInfo(content::WebContents* web_contents) { |
| 425 chrome::ShowWebsiteSettings(browser_, web_contents); | 425 chrome::ShowPageInfo(browser_, web_contents); |
| 426 } | 426 } |
| 427 | 427 |
| 428 //////////////////////////////////////////////////////////////////////////////// | 428 //////////////////////////////////////////////////////////////////////////////// |
| 429 // ToolbarView, CommandObserver implementation: | 429 // ToolbarView, CommandObserver implementation: |
| 430 | 430 |
| 431 void ToolbarView::EnabledStateChangedForCommand(int id, bool enabled) { | 431 void ToolbarView::EnabledStateChangedForCommand(int id, bool enabled) { |
| 432 views::Button* button = NULL; | 432 views::Button* button = NULL; |
| 433 switch (id) { | 433 switch (id) { |
| 434 case IDC_BACK: | 434 case IDC_BACK: |
| 435 button = back_; | 435 button = back_; |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 if (OutdatedUpgradeBubbleView::IsAvailable()) { | 769 if (OutdatedUpgradeBubbleView::IsAvailable()) { |
| 770 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, | 770 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, |
| 771 auto_update_enabled); | 771 auto_update_enabled); |
| 772 } | 772 } |
| 773 } | 773 } |
| 774 | 774 |
| 775 void ToolbarView::OnShowHomeButtonChanged() { | 775 void ToolbarView::OnShowHomeButtonChanged() { |
| 776 Layout(); | 776 Layout(); |
| 777 SchedulePaint(); | 777 SchedulePaint(); |
| 778 } | 778 } |
| OLD | NEW |