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

Side by Side Diff: chrome/browser/ui/gtk/gtk_theme_service_unittest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <gtk/gtk.h> 5 #include <gtk/gtk.h>
6 6
7 #include "chrome/browser/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 9 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
12 #include "grit/theme_resources.h" 12 #include "grit/theme_resources.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/gfx/skia_utils_gtk.h" 14 #include "ui/gfx/skia_utils_gtk.h"
15 15
16 class GtkThemeServiceTest : public testing::Test { 16 class GtkThemeServiceTest : public testing::Test {
17 public: 17 public:
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // large, implied global state, it would take some IN_PROCESS_BROWSER_TESTS 51 // large, implied global state, it would take some IN_PROCESS_BROWSER_TESTS
52 // to write an equivalent of DefaultValues above in a way that wouldn't make 52 // to write an equivalent of DefaultValues above in a way that wouldn't make
53 // other tests flaky. kColorTabText is the only simple path where there's no 53 // other tests flaky. kColorTabText is the only simple path where there's no
54 // weird calculations for edge cases so use that as a simple test. 54 // weird calculations for edge cases so use that as a simple test.
55 GtkWidget* fake_label = provider_->fake_label(); 55 GtkWidget* fake_label = provider_->fake_label();
56 GtkStyle* label_style = gtk_rc_get_style(fake_label); 56 GtkStyle* label_style = gtk_rc_get_style(fake_label);
57 GdkColor label_color = label_style->fg[GTK_STATE_NORMAL]; 57 GdkColor label_color = label_style->fg[GTK_STATE_NORMAL];
58 EXPECT_EQ(provider_->GetColor(ThemeService::COLOR_TAB_TEXT), 58 EXPECT_EQ(provider_->GetColor(ThemeService::COLOR_TAB_TEXT),
59 gfx::GdkColorToSkColor(label_color)); 59 gfx::GdkColorToSkColor(label_color));
60 } 60 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698