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

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

Issue 154733004: Switch to a single merged version of WebThemeEngine.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: reorder the State enums to not break the mock theme Created 6 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderThemeChromiumDefault.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 20 matching lines...) Expand all
31 #include "UserAgentStyleSheets.h" 31 #include "UserAgentStyleSheets.h"
32 #include "core/rendering/PaintInfo.h" 32 #include "core/rendering/PaintInfo.h"
33 #include "core/rendering/RenderMediaControls.h" 33 #include "core/rendering/RenderMediaControls.h"
34 #include "core/rendering/RenderObject.h" 34 #include "core/rendering/RenderObject.h"
35 #include "core/rendering/RenderProgress.h" 35 #include "core/rendering/RenderProgress.h"
36 #include "core/rendering/RenderSlider.h" 36 #include "core/rendering/RenderSlider.h"
37 #include "platform/LayoutTestSupport.h" 37 #include "platform/LayoutTestSupport.h"
38 #include "platform/graphics/Color.h" 38 #include "platform/graphics/Color.h"
39 #include "platform/scroll/ScrollbarTheme.h" 39 #include "platform/scroll/ScrollbarTheme.h"
40 #include "public/platform/Platform.h" 40 #include "public/platform/Platform.h"
41 #include "public/platform/default/WebThemeEngine.h" 41 #include "public/platform/WebThemeEngine.h"
42 #include "wtf/StdLibExtras.h" 42 #include "wtf/StdLibExtras.h"
43 43
44 namespace WebCore { 44 namespace WebCore {
45 45
46 PassRefPtr<RenderTheme> RenderThemeChromiumAndroid::create() 46 PassRefPtr<RenderTheme> RenderThemeChromiumAndroid::create()
47 { 47 {
48 return adoptRef(new RenderThemeChromiumAndroid()); 48 return adoptRef(new RenderThemeChromiumAndroid());
49 } 49 }
50 50
51 RenderTheme& RenderTheme::theme() 51 RenderTheme& RenderTheme::theme()
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 int RenderThemeChromiumAndroid::menuListArrowPadding() const 99 int RenderThemeChromiumAndroid::menuListArrowPadding() const
100 { 100 {
101 // We cannot use the scrollbar thickness here, as it's width is 0 on Android . 101 // We cannot use the scrollbar thickness here, as it's width is 0 on Android .
102 // Instead, use the width of the scrollbar down arrow. 102 // Instead, use the width of the scrollbar down arrow.
103 IntSize scrollbarSize = blink::Platform::current()->themeEngine()->getSize(b link::WebThemeEngine::PartScrollbarDownArrow); 103 IntSize scrollbarSize = blink::Platform::current()->themeEngine()->getSize(b link::WebThemeEngine::PartScrollbarDownArrow);
104 return scrollbarSize.width(); 104 return scrollbarSize.width();
105 } 105 }
106 106
107 } // namespace WebCore 107 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderThemeChromiumDefault.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698