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

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

Issue 1870533002: Convert ContentSettingBubbleContents to a BubbleDialogDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac views Created 4 years, 8 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') | no next file » | 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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
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& 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, url, security_info);
400 } 400 }
401 401
402 views::Widget* ToolbarView::CreateViewsBubble(
403 views::BubbleDelegateView* bubble_delegate) {
404 return views::BubbleDelegateView::CreateBubble(bubble_delegate);
405 }
406
407 PageActionImageView* ToolbarView::CreatePageActionImageView( 402 PageActionImageView* ToolbarView::CreatePageActionImageView(
408 LocationBarView* owner, ExtensionAction* action) { 403 LocationBarView* owner, ExtensionAction* action) {
409 return new PageActionImageView(owner, action, browser_); 404 return new PageActionImageView(owner, action, browser_);
410 } 405 }
411 406
412 //////////////////////////////////////////////////////////////////////////////// 407 ////////////////////////////////////////////////////////////////////////////////
413 // ToolbarView, CommandObserver implementation: 408 // ToolbarView, CommandObserver implementation:
414 409
415 void ToolbarView::EnabledStateChangedForCommand(int id, bool enabled) { 410 void ToolbarView::EnabledStateChangedForCommand(int id, bool enabled) {
416 views::Button* button = NULL; 411 views::Button* button = NULL;
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 SchedulePaint(); 797 SchedulePaint();
803 } 798 }
804 799
805 int ToolbarView::content_shadow_height() const { 800 int ToolbarView::content_shadow_height() const {
806 #if defined(USE_ASH) 801 #if defined(USE_ASH)
807 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH); 802 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
808 #else 803 #else
809 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT); 804 return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
810 #endif 805 #endif
811 } 806 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698