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

Unified Diff: chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
===================================================================
--- chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc (revision 137002)
+++ chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc (working copy)
@@ -20,11 +20,11 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/native_theme/native_theme.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/text/text_elider.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
+#include "ui/gfx/native_theme.h"
namespace {
@@ -139,11 +139,11 @@
colors[NORMAL][TEXT] = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
colors[SELECTED][TEXT] = color_utils::GetSysSkColor(COLOR_HIGHLIGHTTEXT);
#elif defined(USE_AURA)
- const ui::NativeTheme* theme = ui::NativeTheme::instance();
+ const gfx::NativeTheme* theme = gfx::NativeTheme::instance();
colors[SELECTED][BACKGROUND] = theme->GetSystemColor(
- ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
+ gfx::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused);
colors[NORMAL][BACKGROUND] = theme->GetSystemColor(
- ui::NativeTheme::kColorId_TextfieldDefaultBackground);
+ gfx::NativeTheme::kColorId_TextfieldDefaultBackground);
colors[NORMAL][URL] = SkColorSetARGB(0xff, 0x00, 0x99, 0x33);
colors[SELECTED][URL] = SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
colors[HOVERED][URL] = SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698