Commit 4b4b53eb authored by jam@chromium.org's avatar jam@chromium.org

Build fixes for r99884 for clang and Linux shared build.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99885 0039d316-1c4b-4281-b951-d872f2087c98
parent f967b723
...@@ -11,7 +11,7 @@ class BrowserMainPartsChromeos : public BrowserMainPartsGtk { ...@@ -11,7 +11,7 @@ class BrowserMainPartsChromeos : public BrowserMainPartsGtk {
public: public:
explicit BrowserMainPartsChromeos(const MainFunctionParams& parameters); explicit BrowserMainPartsChromeos(const MainFunctionParams& parameters);
~BrowserMainPartsChromeos(); virtual ~BrowserMainPartsChromeos();
virtual void PreMainMessageLoopStart() OVERRIDE; virtual void PreMainMessageLoopStart() OVERRIDE;
virtual void PostMainMessageLoopStart() OVERRIDE; virtual void PostMainMessageLoopStart() OVERRIDE;
......
...@@ -64,7 +64,10 @@ UI_EXPORT std::string RemoveWindowsStyleAccelerators(const std::string& label); ...@@ -64,7 +64,10 @@ UI_EXPORT std::string RemoveWindowsStyleAccelerators(const std::string& label);
// Makes a copy of |pixels| with the ordering changed from BGRA to RGBA. // Makes a copy of |pixels| with the ordering changed from BGRA to RGBA.
// The caller is responsible for free()ing the data. If |stride| is 0, it's // The caller is responsible for free()ing the data. If |stride| is 0, it's
// assumed to be 4 * |width|. // assumed to be 4 * |width|.
uint8_t* BGRAToRGBA(const uint8_t* pixels, int width, int height, int stride); UI_EXPORT uint8_t* BGRAToRGBA(const uint8_t* pixels,
int width,
int height,
int stride);
// Initialize some GTK settings so that our dialogs are consistent. // Initialize some GTK settings so that our dialogs are consistent.
void InitRCStyles(); void InitRCStyles();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment