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

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

Issue 1995813002: Use the virtual URL of the page in the Page Info Bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac build Created 4 years, 6 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
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/test/base/test_browser_window.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 return browser_->toolbar_model(); 387 return browser_->toolbar_model();
388 } 388 }
389 389
390 ContentSettingBubbleModelDelegate* 390 ContentSettingBubbleModelDelegate*
391 ToolbarView::GetContentSettingBubbleModelDelegate() { 391 ToolbarView::GetContentSettingBubbleModelDelegate() {
392 return browser_->content_setting_bubble_model_delegate(); 392 return browser_->content_setting_bubble_model_delegate();
393 } 393 }
394 394
395 void ToolbarView::ShowWebsiteSettings( 395 void ToolbarView::ShowWebsiteSettings(
396 content::WebContents* web_contents, 396 content::WebContents* web_contents,
397 const GURL& url, 397 const GURL& virtual_url,
398 const security_state::SecurityStateModel::SecurityInfo& security_info) { 398 const security_state::SecurityStateModel::SecurityInfo& security_info) {
399 chrome::ShowWebsiteSettings(browser_, web_contents, url, security_info); 399 chrome::ShowWebsiteSettings(browser_, web_contents, virtual_url,
400 security_info);
400 } 401 }
401 402
402 PageActionImageView* ToolbarView::CreatePageActionImageView( 403 PageActionImageView* ToolbarView::CreatePageActionImageView(
403 LocationBarView* owner, ExtensionAction* action) { 404 LocationBarView* owner, ExtensionAction* action) {
404 return new PageActionImageView(owner, action, browser_); 405 return new PageActionImageView(owner, action, browser_);
405 } 406 }
406 407
407 //////////////////////////////////////////////////////////////////////////////// 408 ////////////////////////////////////////////////////////////////////////////////
408 // ToolbarView, CommandObserver implementation: 409 // ToolbarView, CommandObserver implementation:
409 410
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 SchedulePaint(); 796 SchedulePaint();
796 } 797 }
797 798
798 int ToolbarView::content_shadow_height() const { 799 int ToolbarView::content_shadow_height() const {
799 #if defined(USE_ASH) 800 #if defined(USE_ASH)
800 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH); 801 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
801 #else 802 #else
802 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT); 803 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
803 #endif 804 #endif
804 } 805 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | chrome/test/base/test_browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698