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

Unified Diff: ui/views/corewm/tooltip_aura.cc

Issue 263533003: Revert of Linux Aura: get tooltip background color from theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/tooltip_aura.cc
diff --git a/ui/views/corewm/tooltip_aura.cc b/ui/views/corewm/tooltip_aura.cc
index 777603cbeac70def1ed7e14d968cbbe9c6ef74a6..50ced84d66dc4bbe2acfd2b7a86b4f76adc0d72a 100644
--- a/ui/views/corewm/tooltip_aura.cc
+++ b/ui/views/corewm/tooltip_aura.cc
@@ -12,13 +12,13 @@
#include "ui/gfx/screen.h"
#include "ui/gfx/text_elider.h"
#include "ui/gfx/text_utils.h"
-#include "ui/native_theme/native_theme.h"
#include "ui/views/background.h"
#include "ui/views/border.h"
#include "ui/views/widget/widget.h"
namespace {
+const SkColor kTooltipBackground = 0xFFFFFFCC;
const int kTooltipHorizontalPadding = 3;
// Max visual tooltip width. If a tooltip is greater than this width, it will
@@ -60,6 +60,8 @@
: screen_type_(screen_type),
widget_(NULL),
tooltip_window_(NULL) {
+ label_.set_background(
+ views::Background::CreateSolidBackground(kTooltipBackground));
label_.set_owned_by_client();
label_.SetMultiLine(true);
}
@@ -232,11 +234,6 @@
2 * kTooltipVerticalPadding;
CreateWidget();
SetTooltipBounds(location, width, height);
-
- label_.set_background(
- views::Background::CreateSolidBackground(
- widget_->GetNativeTheme()->GetSystemColor(
- ui::NativeTheme::kColorId_TooltipBackground)));
}
void TooltipAura::Show() {
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698