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

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

Issue 1314953009: Refactor WebsiteSettings to operate on a SecurityInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 3 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 398
399 const ToolbarModel* ToolbarView::GetToolbarModel() const { 399 const ToolbarModel* ToolbarView::GetToolbarModel() const {
400 return browser_->toolbar_model(); 400 return browser_->toolbar_model();
401 } 401 }
402 402
403 ContentSettingBubbleModelDelegate* 403 ContentSettingBubbleModelDelegate*
404 ToolbarView::GetContentSettingBubbleModelDelegate() { 404 ToolbarView::GetContentSettingBubbleModelDelegate() {
405 return browser_->content_setting_bubble_model_delegate(); 405 return browser_->content_setting_bubble_model_delegate();
406 } 406 }
407 407
408 void ToolbarView::ShowWebsiteSettings(content::WebContents* web_contents, 408 void ToolbarView::ShowWebsiteSettings(
409 const GURL& url, 409 content::WebContents* web_contents,
410 const content::SSLStatus& ssl) { 410 const GURL& url,
411 chrome::ShowWebsiteSettings(browser_, web_contents, url, ssl); 411 const SecurityStateModel::SecurityInfo& security_info) {
412 chrome::ShowWebsiteSettings(browser_, web_contents, url, security_info);
412 } 413 }
413 414
414 views::Widget* ToolbarView::CreateViewsBubble( 415 views::Widget* ToolbarView::CreateViewsBubble(
415 views::BubbleDelegateView* bubble_delegate) { 416 views::BubbleDelegateView* bubble_delegate) {
416 return views::BubbleDelegateView::CreateBubble(bubble_delegate); 417 return views::BubbleDelegateView::CreateBubble(bubble_delegate);
417 } 418 }
418 419
419 PageActionImageView* ToolbarView::CreatePageActionImageView( 420 PageActionImageView* ToolbarView::CreatePageActionImageView(
420 LocationBarView* owner, ExtensionAction* action) { 421 LocationBarView* owner, ExtensionAction* action) {
421 return new PageActionImageView(owner, action, browser_); 422 return new PageActionImageView(owner, action, browser_);
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 Layout(); 827 Layout();
827 SchedulePaint(); 828 SchedulePaint();
828 } 829 }
829 830
830 int ToolbarView::content_shadow_height() const { 831 int ToolbarView::content_shadow_height() const {
831 return GetLayoutConstant( 832 return GetLayoutConstant(
832 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) 833 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
833 ? TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH 834 ? TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH
834 : TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT); 835 : TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT);
835 } 836 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698