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

Side by Side Diff: chrome/browser/ui/views/collected_cookies_views.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/collected_cookies_views.h" 5 #include "chrome/browser/ui/views/collected_cookies_views.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" 8 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
9 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" 9 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
10 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" 10 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // A custom view that conditionally displays an infobar. 89 // A custom view that conditionally displays an infobar.
90 class InfobarView : public views::View { 90 class InfobarView : public views::View {
91 public: 91 public:
92 InfobarView() { 92 InfobarView() {
93 content_ = new views::View; 93 content_ = new views::View;
94 #if defined(USE_AURA) || !defined(OS_WIN) 94 #if defined(USE_AURA) || !defined(OS_WIN)
95 SkColor border_color = SK_ColorGRAY; 95 SkColor border_color = SK_ColorGRAY;
96 #else 96 #else
97 SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW); 97 SkColor border_color = color_utils::GetSysSkColor(COLOR_3DSHADOW);
98 #endif 98 #endif
99 views::Border* border = views::Border::CreateSolidBorder( 99 content_->SetBorder(
100 kInfobarBorderSize, border_color); 100 views::Border::CreateSolidBorder(kInfobarBorderSize, border_color));
101 content_->set_border(border);
102 101
103 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 102 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
104 info_image_ = new views::ImageView(); 103 info_image_ = new views::ImageView();
105 info_image_->SetImage(rb.GetImageSkiaNamed(IDR_INFO)); 104 info_image_->SetImage(rb.GetImageSkiaNamed(IDR_INFO));
106 label_ = new views::Label(); 105 label_ = new views::Label();
107 } 106 }
108 virtual ~InfobarView() {} 107 virtual ~InfobarView() {}
109 108
110 // Update the visibility of the infobar. If |is_visible| is true, a rule for 109 // Update the visibility of the infobar. If |is_visible| is true, a rule for
111 // |setting| on |domain_name| was created. 110 // |setting| on |domain_name| was created.
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 layout->StartRow(0, three_columns_layout_id); 495 layout->StartRow(0, three_columns_layout_id);
497 layout->AddView(allow_blocked_button_); 496 layout->AddView(allow_blocked_button_);
498 layout->AddView(for_session_blocked_button_); 497 layout->AddView(for_session_blocked_button_);
499 498
500 return pane; 499 return pane;
501 } 500 }
502 501
503 views::View* CollectedCookiesViews::CreateScrollView(views::TreeView* pane) { 502 views::View* CollectedCookiesViews::CreateScrollView(views::TreeView* pane) {
504 views::ScrollView* scroll_view = new views::ScrollView(); 503 views::ScrollView* scroll_view = new views::ScrollView();
505 scroll_view->SetContents(pane); 504 scroll_view->SetContents(pane);
506 scroll_view->set_border( 505 scroll_view->SetBorder(
507 views::Border::CreateSolidBorder(1, kCookiesBorderColor)); 506 views::Border::CreateSolidBorder(1, kCookiesBorderColor));
508 return scroll_view; 507 return scroll_view;
509 } 508 }
510 509
511 void CollectedCookiesViews::EnableControls() { 510 void CollectedCookiesViews::EnableControls() {
512 bool enable_allowed_buttons = false; 511 bool enable_allowed_buttons = false;
513 ui::TreeModelNode* node = allowed_cookies_tree_->GetSelectedNode(); 512 ui::TreeModelNode* node = allowed_cookies_tree_->GetSelectedNode();
514 if (node) { 513 if (node) {
515 CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node); 514 CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node);
516 if (cookie_node->GetDetailedInfo().node_type == 515 if (cookie_node->GetDetailedInfo().node_type ==
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 /////////////////////////////////////////////////////////////////////////////// 571 ///////////////////////////////////////////////////////////////////////////////
573 // CollectedCookiesViews, content::NotificationObserver implementation: 572 // CollectedCookiesViews, content::NotificationObserver implementation:
574 573
575 void CollectedCookiesViews::Observe( 574 void CollectedCookiesViews::Observe(
576 int type, 575 int type,
577 const content::NotificationSource& source, 576 const content::NotificationSource& source,
578 const content::NotificationDetails& details) { 577 const content::NotificationDetails& details) {
579 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type); 578 DCHECK_EQ(chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, type);
580 window_->Close(); 579 window_->Close();
581 } 580 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698