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

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

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit test debugging Created 5 years 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 } 390 }
391 391
392 ContentSettingBubbleModelDelegate* 392 ContentSettingBubbleModelDelegate*
393 ToolbarView::GetContentSettingBubbleModelDelegate() { 393 ToolbarView::GetContentSettingBubbleModelDelegate() {
394 return browser_->content_setting_bubble_model_delegate(); 394 return browser_->content_setting_bubble_model_delegate();
395 } 395 }
396 396
397 void ToolbarView::ShowWebsiteSettings( 397 void ToolbarView::ShowWebsiteSettings(
398 content::WebContents* web_contents, 398 content::WebContents* web_contents,
399 const GURL& url, 399 const GURL& url,
400 const SecurityStateModel::SecurityInfo& security_info) { 400 const security_state::SecurityStateModel::SecurityInfo& security_info) {
401 chrome::ShowWebsiteSettings(browser_, web_contents, url, security_info); 401 chrome::ShowWebsiteSettings(browser_, web_contents, url, security_info);
402 } 402 }
403 403
404 views::Widget* ToolbarView::CreateViewsBubble( 404 views::Widget* ToolbarView::CreateViewsBubble(
405 views::BubbleDelegateView* bubble_delegate) { 405 views::BubbleDelegateView* bubble_delegate) {
406 return views::BubbleDelegateView::CreateBubble(bubble_delegate); 406 return views::BubbleDelegateView::CreateBubble(bubble_delegate);
407 } 407 }
408 408
409 PageActionImageView* ToolbarView::CreatePageActionImageView( 409 PageActionImageView* ToolbarView::CreatePageActionImageView(
410 LocationBarView* owner, ExtensionAction* action) { 410 LocationBarView* owner, ExtensionAction* action) {
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 void ToolbarView::OnShowHomeButtonChanged() { 809 void ToolbarView::OnShowHomeButtonChanged() {
810 Layout(); 810 Layout();
811 SchedulePaint(); 811 SchedulePaint();
812 } 812 }
813 813
814 int ToolbarView::content_shadow_height() const { 814 int ToolbarView::content_shadow_height() const {
815 return GetLayoutConstant( 815 return GetLayoutConstant(
816 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? 816 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
817 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); 817 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
818 } 818 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698