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

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

Issue 2660293002: Show Page Info from Form-Not-Secure 'Learn more' link (Closed)
Patch Set: Created 3 years, 10 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
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 <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 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 415
416 const ToolbarModel* ToolbarView::GetToolbarModel() const { 416 const ToolbarModel* ToolbarView::GetToolbarModel() const {
417 return browser_->toolbar_model(); 417 return browser_->toolbar_model();
418 } 418 }
419 419
420 ContentSettingBubbleModelDelegate* 420 ContentSettingBubbleModelDelegate*
421 ToolbarView::GetContentSettingBubbleModelDelegate() { 421 ToolbarView::GetContentSettingBubbleModelDelegate() {
422 return browser_->content_setting_bubble_model_delegate(); 422 return browser_->content_setting_bubble_model_delegate();
423 } 423 }
424 424
425 void ToolbarView::ShowWebsiteSettings( 425 void ToolbarView::ShowWebsiteSettings(content::WebContents* web_contents) {
426 content::WebContents* web_contents, 426 chrome::ShowWebsiteSettings(browser_, web_contents);
427 const GURL& virtual_url,
428 const security_state::SecurityInfo& security_info) {
429 chrome::ShowWebsiteSettings(browser_, web_contents, virtual_url,
430 security_info);
431 } 427 }
432 428
433 PageActionImageView* ToolbarView::CreatePageActionImageView( 429 PageActionImageView* ToolbarView::CreatePageActionImageView(
434 LocationBarView* owner, ExtensionAction* action) { 430 LocationBarView* owner, ExtensionAction* action) {
435 return new PageActionImageView(owner, action, browser_); 431 return new PageActionImageView(owner, action, browser_);
436 } 432 }
437 433
438 //////////////////////////////////////////////////////////////////////////////// 434 ////////////////////////////////////////////////////////////////////////////////
439 // ToolbarView, CommandObserver implementation: 435 // ToolbarView, CommandObserver implementation:
440 436
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 if (OutdatedUpgradeBubbleView::IsAvailable()) { 777 if (OutdatedUpgradeBubbleView::IsAvailable()) {
782 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_, 778 OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
783 auto_update_enabled); 779 auto_update_enabled);
784 } 780 }
785 } 781 }
786 782
787 void ToolbarView::OnShowHomeButtonChanged() { 783 void ToolbarView::OnShowHomeButtonChanged() {
788 Layout(); 784 Layout();
789 SchedulePaint(); 785 SchedulePaint();
790 } 786 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698