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

Side by Side Diff: chrome/browser/renderer_preferences_util.cc

Issue 9826031: Fixing highlight color (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Reverted some color changes of not used code Created 8 years, 9 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
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 "chrome/browser/renderer_preferences_util.h" 5 #include "chrome/browser/renderer_preferences_util.h"
6 6
7 #include "chrome/browser/prefs/pref_service.h" 7 #include "chrome/browser/prefs/pref_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 #include "content/public/common/renderer_preferences.h" 10 #include "content/public/common/renderer_preferences.h"
(...skipping 18 matching lines...) Expand all
29 prefs->thumb_inactive_color = theme_service->get_thumb_inactive_color(); 29 prefs->thumb_inactive_color = theme_service->get_thumb_inactive_color();
30 prefs->track_color = theme_service->get_track_color(); 30 prefs->track_color = theme_service->get_track_color();
31 prefs->active_selection_bg_color = 31 prefs->active_selection_bg_color =
32 theme_service->get_active_selection_bg_color(); 32 theme_service->get_active_selection_bg_color();
33 prefs->active_selection_fg_color = 33 prefs->active_selection_fg_color =
34 theme_service->get_active_selection_fg_color(); 34 theme_service->get_active_selection_fg_color();
35 prefs->inactive_selection_bg_color = 35 prefs->inactive_selection_bg_color =
36 theme_service->get_inactive_selection_bg_color(); 36 theme_service->get_inactive_selection_bg_color();
37 prefs->inactive_selection_fg_color = 37 prefs->inactive_selection_fg_color =
38 theme_service->get_inactive_selection_fg_color(); 38 theme_service->get_inactive_selection_fg_color();
39 #else 39 #else
Daniel Erat 2012/03/22 22:56:13 Mind cleaning this up? We don't need to support t
Ben Goodger (Google) 2012/03/22 23:04:36 USE_ASH please! We will match OS_WIN preferences
Mr4D (OOO till 08-26) 2012/03/22 23:15:53 Done.
Mr4D (OOO till 08-26) 2012/03/22 23:15:53 Sure! I was not sure if GTK is gone for good or mi
40 prefs->focus_ring_color = SkColorSetRGB(0x50, 0x7A, 0xD5); 40 prefs->focus_ring_color = SkColorSetRGB(0x50, 0x7A, 0xD5);
41 prefs->active_selection_bg_color = SkColorSetRGB(0xDC, 0xE4, 0xFA); 41 prefs->active_selection_bg_color = SkColorSetRGB(0xDC, 0xE4, 0xFA);
42 prefs->active_selection_fg_color = SK_ColorBLACK; 42 prefs->active_selection_fg_color = SK_ColorBLACK;
43 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); 43 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
44 prefs->inactive_selection_fg_color = SK_ColorBLACK; 44 prefs->inactive_selection_fg_color = SK_ColorBLACK;
45 #endif // defined(OS_CHROMEOS) 45 #endif // defined(OS_CHROMEOS)
46 46
47 #else // defined(TOOLKIT_USES_GTK)
48
49 #if defined(OS_CHROMEOS)
50 // This color is 0x544d90fe modulated with 0xffffff.
51 prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA);
52 prefs->active_selection_fg_color = SK_ColorBLACK;
53 prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
54 prefs->inactive_selection_fg_color = SK_ColorBLACK;
55 #endif // defined(OS_CHROMEOS)
56
47 #endif // defined(TOOLKIT_USES_GTK) 57 #endif // defined(TOOLKIT_USES_GTK)
48 58
49 prefs->enable_referrers = 59 prefs->enable_referrers =
50 profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers); 60 profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers);
51 prefs->default_zoom_level = 61 prefs->default_zoom_level =
52 profile->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel); 62 profile->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel);
53 } 63 }
54 64
55 } // renderer_preferences_util 65 } // renderer_preferences_util
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | content/renderer/render_view_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698