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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 1423263004: [MD] Use programmatic rendering for omnibox chips (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: self review Created 5 years, 1 month 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/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index c2c44caa1da8cf3f4f25566feaa1ec4aab91ca59..9935831fe0cf67b306050c9f89ef1aed4478fb4c 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -82,6 +82,7 @@
#include "ui/events/event.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia_operations.h"
@@ -259,10 +260,7 @@ void LocationBarView::Init() {
ime_inline_autocomplete_view_->SetVisible(false);
AddChildView(ime_inline_autocomplete_view_);
- const SkColor selected_text_color = GetColor(
- SecurityStateModel::NONE, ui::MaterialDesignController::IsModeMaterial()
- ? KEYWORD_SEARCH_TEXT
- : TEXT);
+ const SkColor selected_text_color = GetColor(SecurityStateModel::NONE, TEXT);
selected_keyword_view_ = new SelectedKeywordView(
bubble_font_list, selected_text_color, background_color, profile());
AddChildView(selected_keyword_view_);
@@ -367,7 +365,7 @@ SkColor LocationBarView::GetColor(
case SecurityStateModel::EV_SECURE:
case SecurityStateModel::SECURE:
if (ui::MaterialDesignController::IsModeMaterial())
- color = SkColorSetRGB(11, 128, 67);
+ color = gfx::kGoogleGreen700;
else
color = SkColorSetRGB(7, 149, 0);
Peter Kasting 2015/11/05 06:22:11 Nit: Shorter: color = ui::MaterialDesig
Evan Stade 2015/11/05 23:59:29 Done.
break;
@@ -392,9 +390,6 @@ SkColor LocationBarView::GetColor(
color, GetColor(security_level, BACKGROUND));
}
- case KEYWORD_SEARCH_TEXT:
- return SkColorSetRGB(51, 103, 214);
-
default:
NOTREACHED();
return GetColor(security_level, TEXT);

Powered by Google App Engine
This is Rietveld 408576698