Skip to content

Commit

Permalink
[MD] Add a few more incognito colors
Browse files Browse the repository at this point in the history
BUG=501377

Review URL: https://codereview.chromium.org/1450213003

Cr-Commit-Position: refs/heads/master@{#360191}
  • Loading branch information
estade authored and Commit bot committed Nov 17, 2015
1 parent 66ad73d commit a6c4958
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 5 deletions.
1 change: 0 additions & 1 deletion chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ void OpenPDFInReaderBubbleView::Init() {

base::string16 accept_text = model_->GetAcceptButtonText();
open_in_reader_link_ = new views::Link(accept_text);
open_in_reader_link_->SetEnabled(true);
open_in_reader_link_->set_listener(this);
layout->StartRow(0, single_column_set_id);
layout->AddView(open_in_reader_link_);
Expand Down
2 changes: 2 additions & 0 deletions ui/native_theme/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
estade@chromium.org
pkasting@chromium.org
50 changes: 46 additions & 4 deletions ui/native_theme/native_theme_dark_aura.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "ui/native_theme/native_theme_dark_aura.h"

#include "ui/base/resource/material_design/material_design_controller.h"
#include "ui/gfx/color_palette.h"

namespace ui {

Expand All @@ -17,28 +18,41 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
if (!ui::MaterialDesignController::IsModeMaterial())
return NativeThemeAura::GetSystemColor(color_id);

static const SkColor kLinkEnabledColor = SkColorSetRGB(0x7B, 0xAA, 0xF7);
static const SkColor kLinkEnabledColor = gfx::kGoogleBlue300;

static const SkColor kTextfieldDefaultColor = SK_ColorWHITE;
static const SkColor kTextfieldDefaultBackground =
SkColorSetRGB(0x62, 0x62, 0x62);
static const SkColor kTextfieldSelectionBackgroundFocused =
SkColorSetA(gfx::kGoogleBlue700, 0xCC);

static const SkColor kResultsTableNormalBackground =
SkColorSetRGB(0x28, 0x28, 0x28);
static const SkColor kResultsTableText = SK_ColorWHITE;
static const SkColor kResultsTableDimmedText =
SkColorSetA(kResultsTableText, 0x80);

static const SkColor kThrobberSpinning = SK_ColorWHITE;
static const SkColor kThrobberWaiting = SkColorSetA(kThrobberSpinning, 0x80);

switch (color_id) {
// Button
case kColorId_CallToActionColor:
return kLinkEnabledColor;

// Link
case kColorId_LinkEnabled:
case kColorId_LinkPressed:
return kLinkEnabledColor;

// Textfield
case kColorId_TextfieldDefaultColor:
case kColorId_TextfieldSelectionColor:
return kTextfieldDefaultColor;
case kColorId_TextfieldDefaultBackground:
return kTextfieldDefaultBackground;
case kColorId_TextfieldSelectionBackgroundFocused:
return kTextfieldSelectionBackgroundFocused;

// Results Tables
case kColorId_ResultsTableNormalBackground:
Expand All @@ -55,11 +69,39 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
case kColorId_ResultsTableSelectedDimmedText:
return kResultsTableDimmedText;

// Colors for the material spinner (aka throbber).
case kColorId_ThrobberSpinningColor:
case kColorId_ThrobberLightColor:
return kThrobberSpinning;
case kColorId_ThrobberWaitingColor:
return kThrobberWaiting;

// Intentional pass-throughs to NativeThemeAura.
case kColorId_ResultsTableHoveredBackground:
case kColorId_ResultsTableSelectedBackground:
case kColorId_ResultsTableNormalUrl:
case kColorId_ResultsTableHoveredUrl:
case kColorId_ResultsTableSelectedUrl:
return NativeThemeAura::GetSystemColor(color_id);

// Temporary pass-throughs to NativeThemeAura, for colors not yet defined
// for dark themes. TODO(estade): define colors for these and remove this
// block.
case kColorId_ResultsTableNormalDivider:
case kColorId_ResultsTableHoveredDivider:
case kColorId_ResultsTableSelectedDivider:
case kColorId_ResultsTablePositiveText:
case kColorId_ResultsTablePositiveHoveredText:
case kColorId_ResultsTablePositiveSelectedText:
case kColorId_ResultsTableNegativeText:
case kColorId_ResultsTableNegativeHoveredText:
case kColorId_ResultsTableNegativeSelectedText:
return NativeThemeAura::GetSystemColor(color_id);

// Any other color is not defined and shouldn't be used in a dark theme.
default:
break;
return gfx::kPlaceholderColor;
}

return NativeThemeAura::GetSystemColor(color_id);
}

NativeThemeDarkAura::NativeThemeDarkAura() {}
Expand Down

0 comments on commit a6c4958

Please sign in to comment.