| OLD | NEW |
| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 0, 0, 0)); | 135 0, 0, 0)); |
| 136 return label; | 136 return label; |
| 137 } | 137 } |
| 138 | 138 |
| 139 // Creates a link. | 139 // Creates a link. |
| 140 views::Link* CreateLink() { | 140 views::Link* CreateLink() { |
| 141 views::Link* link = new views::Link(); | 141 views::Link* link = new views::Link(); |
| 142 link->SetEnabledColor(kEnabledLinkColor); | 142 link->SetEnabledColor(kEnabledLinkColor); |
| 143 link->SetDisabledColor(kDisabledLinkColor); | 143 link->SetDisabledColor(kDisabledLinkColor); |
| 144 link->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 144 link->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 145 link->SetUnderlineOnHover(true); |
| 145 return link; | 146 return link; |
| 146 } | 147 } |
| 147 | 148 |
| 148 // Creates a header for the inline disposition dialog. | 149 // Creates a header for the inline disposition dialog. |
| 149 views::View* CreateInlineDispositionHeader( | 150 views::View* CreateInlineDispositionHeader( |
| 150 views::ImageView* app_icon, | 151 views::ImageView* app_icon, |
| 151 views::Label* app_title, | 152 views::Label* app_title, |
| 152 views::Link* use_another_service_link) { | 153 views::Link* use_another_service_link) { |
| 153 views::View* header = new views::View(); | 154 views::View* header = new views::View(); |
| 154 views::GridLayout* grid_layout = new views::GridLayout(header); | 155 views::GridLayout* grid_layout = new views::GridLayout(header); |
| (...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1584 if (inline_service) | 1585 if (inline_service) |
| 1585 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); | 1586 inline_service_icon_->SetImage(inline_service->favicon.ToImageSkia()); |
| 1586 } | 1587 } |
| 1587 | 1588 |
| 1588 void WebIntentPickerViews::RefreshExtensions() { | 1589 void WebIntentPickerViews::RefreshExtensions() { |
| 1589 DCHECK(extensions_); | 1590 DCHECK(extensions_); |
| 1590 extensions_->Update(); | 1591 extensions_->Update(); |
| 1591 contents_->Layout(); | 1592 contents_->Layout(); |
| 1592 SizeToContents(); | 1593 SizeToContents(); |
| 1593 } | 1594 } |
| OLD | NEW |