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

Unified Diff: Source/core/rendering/RenderThemeChromiumLinux.cpp

Issue 738113003: Refactor RenderThemeChromiumDefault (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix android build Created 6 years, 1 month 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
Index: Source/core/rendering/RenderThemeChromiumLinux.cpp
diff --git a/Source/modules/accessibility/AXListBox.cpp b/Source/core/rendering/RenderThemeChromiumLinux.cpp
similarity index 65%
copy from Source/modules/accessibility/AXListBox.cpp
copy to Source/core/rendering/RenderThemeChromiumLinux.cpp
index 1d7b7756fb312e955272963cce406101d46868cd..1bc8fd2f16a7cde11ea7c5d24f39c4c4b155e2d1 100644
--- a/Source/modules/accessibility/AXListBox.cpp
+++ b/Source/core/rendering/RenderThemeChromiumLinux.cpp
@@ -1,5 +1,5 @@
/*
tkent 2014/11/20 01:53:26 Please use Chromium style header. http://www.chrom
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Samsung Electronics. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -10,9 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -27,27 +24,30 @@
*/
#include "config.h"
-#include "modules/accessibility/AXListBox.h"
+#include "core/rendering/RenderThemeChromiumLinux.h"
-#include "core/rendering/RenderListBox.h"
-#include "modules/accessibility/AXListBoxOption.h"
+#include "core/UserAgentStyleSheets.h"
namespace blink {
-using namespace HTMLNames;
-
-AXListBox::AXListBox(RenderObject* renderer)
- : AXRenderObject(renderer)
+PassRefPtr<RenderTheme> RenderThemeChromiumLinux::create()
{
+ return adoptRef(new RenderThemeChromiumLinux());
}
-AXListBox::~AXListBox()
+// RenderTheme::theme for Android is defined in RenderThemeChromiumAndroid.cpp.
+#if !OS(ANDROID)
tkent 2014/11/20 01:53:26 Let's avoid this. - RenderThemeChromiumAndroid sho
+RenderTheme& RenderTheme::theme()
{
+ DEFINE_STATIC_REF(RenderTheme, renderTheme, (RenderThemeChromiumLinux::create()));
+ return *renderTheme;
}
+#endif
-PassRefPtr<AXListBox> AXListBox::create(RenderObject* renderer)
+String RenderThemeChromiumLinux::extraDefaultStyleSheet()
{
- return adoptRef(new AXListBox(renderer));
+ return RenderThemeChromiumDefault::extraDefaultStyleSheet() +
+ String(themeChromiumLinuxCss, sizeof(themeChromiumLinuxCss));
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698