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

Unified Diff: chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

Issue 24012002: Move Range code to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: d Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
index 75a873d5dc60276b055e3b18fba8aff6a18f9930..e898032421cf6acd3ffcc1d96ca5c1ff908d8ee8 100644
--- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
+++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
@@ -22,9 +22,9 @@
#include "grit/generated_resources.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/range/range.h"
#include "ui/gfx/font.h"
#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/range/range.h"
#include "ui/views/background.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/styled_label.h"
@@ -171,7 +171,7 @@ void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
views::StyledLabel::RangeStyleInfo bold_style;
bold_style.font_style = gfx::Font::BOLD;
prompt_label->AddStyleRange(
- ui::Range(offset, offset + domain.size()), bold_style);
+ gfx::Range(offset, offset + domain.size()), bold_style);
// Create the prompt bar.
views::View* prompt_bar = new views::View;
@@ -195,7 +195,7 @@ void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
username, learn_more_text, &offsets);
explanation_label_ = new views::StyledLabel(signin_explanation_text, this);
explanation_label_->AddStyleRange(
- ui::Range(offsets[1], offsets[1] + learn_more_text.size()),
+ gfx::Range(offsets[1], offsets[1] + learn_more_text.size()),
views::StyledLabel::RangeStyleInfo::CreateForLink());
// Layout the components.
@@ -236,7 +236,7 @@ void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
}
void ProfileSigninConfirmationDialogViews::StyledLabelLinkClicked(
- const ui::Range& range,
+ const gfx::Range& range,
int event_flags) {
chrome::NavigateParams params(
browser_,

Powered by Google App Engine
This is Rietveld 408576698