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

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

Issue 11818044: Replace IDR_WEB_UI_CLOSE* with IDR_CLOSE_DIALOG*, cleanup, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 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 <algorithm> 5 #include <algorithm>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 views::View* child = view->child_at(i); 96 views::View* child = view->child_at(i);
97 child->SetEnabled(enabled); 97 child->SetEnabled(enabled);
98 } 98 }
99 } 99 }
100 100
101 // Create a "close" button. 101 // Create a "close" button.
102 views::ImageButton* CreateCloseButton(views::ButtonListener* listener) { 102 views::ImageButton* CreateCloseButton(views::ButtonListener* listener) {
103 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 103 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
104 views::ImageButton* close_button = new views::ImageButton(listener); 104 views::ImageButton* close_button = new views::ImageButton(listener);
105 close_button->SetImage(views::CustomButton::STATE_NORMAL, 105 close_button->SetImage(views::CustomButton::STATE_NORMAL,
106 rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE)); 106 rb.GetImageSkiaNamed(IDR_CLOSE_DIALOG));
107 close_button->SetImage(views::CustomButton::STATE_HOVERED, 107 close_button->SetImage(views::CustomButton::STATE_HOVERED,
108 rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_HOVER)); 108 rb.GetImageSkiaNamed(IDR_CLOSE_DIALOG_H));
109 close_button->SetImage(views::CustomButton::STATE_PRESSED, 109 close_button->SetImage(views::CustomButton::STATE_PRESSED,
110 rb.GetImageSkiaNamed(IDR_WEB_UI_CLOSE_PRESSED)); 110 rb.GetImageSkiaNamed(IDR_CLOSE_DIALOG_P));
111 return close_button; 111 return close_button;
112 } 112 }
113 113
114 // Creates a label. 114 // Creates a label.
115 views::Label* CreateLabel() { 115 views::Label* CreateLabel() {
116 views::Label* label = new views::Label(); 116 views::Label* label = new views::Label();
117 label->SetEnabledColor(kEnabledLabelColor); 117 label->SetEnabledColor(kEnabledLabelColor);
118 label->SetHorizontalAlignment(gfx::ALIGN_LEFT); 118 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
119 return label; 119 return label;
120 } 120 }
(...skipping 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 if (inline_service) 1592 if (inline_service)
1593 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); 1593 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia());
1594 } 1594 }
1595 1595
1596 void WebIntentPickerViews::RefreshExtensions() { 1596 void WebIntentPickerViews::RefreshExtensions() {
1597 DCHECK(extensions_); 1597 DCHECK(extensions_);
1598 extensions_->Update(); 1598 extensions_->Update();
1599 contents_->Layout(); 1599 contents_->Layout();
1600 SizeToContents(); 1600 SizeToContents();
1601 } 1601 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/confirm_bubble_views.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698