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

Side by Side Diff: Source/core/rendering/RenderThemeChromiumDefault.cpp

Issue 23672027: Rename OS(WINDOWS) to OS(WIN) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 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
« no previous file with comments | « Source/core/platform/text/LineEnding.cpp ('k') | Source/web/EditorClientImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. 2 * Copyright (C) 2007 Apple Inc.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2008 Collabora Ltd. 4 * Copyright (C) 2008 Collabora Ltd.
5 * Copyright (C) 2008, 2009 Google Inc. 5 * Copyright (C) 2008, 2009 Google Inc.
6 * Copyright (C) 2009 Kenneth Rohde Christiansen 6 * Copyright (C) 2009 Kenneth Rohde Christiansen
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 if (cssValueId == CSSValueButtonface) 95 if (cssValueId == CSSValueButtonface)
96 return defaultButtonGrayColor; 96 return defaultButtonGrayColor;
97 if (cssValueId == CSSValueMenu) 97 if (cssValueId == CSSValueMenu)
98 return defaultMenuColor; 98 return defaultMenuColor;
99 return RenderTheme::systemColor(cssValueId); 99 return RenderTheme::systemColor(cssValueId);
100 } 100 }
101 101
102 String RenderThemeChromiumDefault::extraDefaultStyleSheet() 102 String RenderThemeChromiumDefault::extraDefaultStyleSheet()
103 { 103 {
104 #if !OS(WINDOWS) 104 #if !OS(WIN)
105 return RenderTheme::extraDefaultStyleSheet() + 105 return RenderTheme::extraDefaultStyleSheet() +
106 RenderThemeChromiumSkia::extraDefaultStyleSheet() + 106 RenderThemeChromiumSkia::extraDefaultStyleSheet() +
107 String(themeChromiumLinuxUserAgentStyleSheet, sizeof(themeChromiumLinuxU serAgentStyleSheet)); 107 String(themeChromiumLinuxUserAgentStyleSheet, sizeof(themeChromiumLinuxU serAgentStyleSheet));
108 #else 108 #else
109 return RenderTheme::extraDefaultStyleSheet() + 109 return RenderTheme::extraDefaultStyleSheet() +
110 RenderThemeChromiumSkia::extraDefaultStyleSheet(); 110 RenderThemeChromiumSkia::extraDefaultStyleSheet();
111 #endif 111 #endif
112 } 112 }
113 113
114 bool RenderThemeChromiumDefault::controlSupportsTints(const RenderObject* o) con st 114 bool RenderThemeChromiumDefault::controlSupportsTints(const RenderObject* o) con st
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEn gine::PartProgressBar, getWebThemeState(this, o), WebKit::WebRect(rect), &extraP arams); 412 WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEn gine::PartProgressBar, getWebThemeState(this, o), WebKit::WebRect(rect), &extraP arams);
413 return false; 413 return false;
414 } 414 }
415 415
416 bool RenderThemeChromiumDefault::shouldOpenPickerWithF4Key() const 416 bool RenderThemeChromiumDefault::shouldOpenPickerWithF4Key() const
417 { 417 {
418 return true; 418 return true;
419 } 419 }
420 420
421 } // namespace WebCore 421 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/text/LineEnding.cpp ('k') | Source/web/EditorClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698