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

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: rebase Created 4 years, 11 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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 } 391 }
392 392
393 ContentSettingBubbleModelDelegate* 393 ContentSettingBubbleModelDelegate*
394 ToolbarView::GetContentSettingBubbleModelDelegate() { 394 ToolbarView::GetContentSettingBubbleModelDelegate() {
395 return browser_->content_setting_bubble_model_delegate(); 395 return browser_->content_setting_bubble_model_delegate();
396 } 396 }
397 397
398 void ToolbarView::ShowWebsiteSettings( 398 void ToolbarView::ShowWebsiteSettings(
399 content::WebContents* web_contents, 399 content::WebContents* web_contents,
400 const GURL& url, 400 const GURL& url,
401 const SecurityStateModel::SecurityInfo& security_info) { 401 const security_state::SecurityStateModel::SecurityInfo& security_info) {
402 chrome::ShowWebsiteSettings(browser_, web_contents, url, security_info); 402 chrome::ShowWebsiteSettings(browser_, web_contents, url, security_info);
403 } 403 }
404 404
405 views::Widget* ToolbarView::CreateViewsBubble( 405 views::Widget* ToolbarView::CreateViewsBubble(
406 views::BubbleDelegateView* bubble_delegate) { 406 views::BubbleDelegateView* bubble_delegate) {
407 return views::BubbleDelegateView::CreateBubble(bubble_delegate); 407 return views::BubbleDelegateView::CreateBubble(bubble_delegate);
408 } 408 }
409 409
410 PageActionImageView* ToolbarView::CreatePageActionImageView( 410 PageActionImageView* ToolbarView::CreatePageActionImageView(
411 LocationBarView* owner, ExtensionAction* action) { 411 LocationBarView* owner, ExtensionAction* action) {
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 void ToolbarView::OnShowHomeButtonChanged() { 810 void ToolbarView::OnShowHomeButtonChanged() {
811 Layout(); 811 Layout();
812 SchedulePaint(); 812 SchedulePaint();
813 } 813 }
814 814
815 int ToolbarView::content_shadow_height() const { 815 int ToolbarView::content_shadow_height() const {
816 return GetLayoutConstant( 816 return GetLayoutConstant(
817 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ? 817 (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) ?
818 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT); 818 TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH : TOOLBAR_CONTENT_SHADOW_HEIGHT);
819 } 819 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/browser/ui/views/website_settings/website_settings_popup_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698