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

Side by Side Diff: ui/gfx/image_unittest.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "testing/gtest/include/gtest/gtest.h" 6 #include "testing/gtest/include/gtest/gtest.h"
7 #include "third_party/skia/include/core/SkBitmap.h" 7 #include "third_party/skia/include/core/SkBitmap.h"
8 #include "ui/gfx/image.h" 8 #include "ui/gfx/image.h"
9 #include "ui/gfx/image_unittest_util.h" 9 #include "ui/gfx/image_unittest_util.h"
10 10
11 #if defined(OS_LINUX) 11 #if defined(TOOLKIT_USES_GTK)
12 #include <gtk/gtk.h> 12 #include <gtk/gtk.h>
13 #include "ui/gfx/gtk_util.h" 13 #include "ui/gfx/gtk_util.h"
14 #elif defined(OS_MACOSX) 14 #elif defined(OS_MACOSX)
15 #include "base/mac/mac_util.h" 15 #include "base/mac/mac_util.h"
16 #include "skia/ext/skia_utils_mac.h" 16 #include "skia/ext/skia_utils_mac.h"
17 #endif 17 #endif
18 18
19 namespace { 19 namespace {
20 20
21 #if defined(TOOLKIT_VIEWS) 21 #if defined(TOOLKIT_VIEWS)
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 // Sanity check. 204 // Sanity check.
205 EXPECT_EQ(1u, image.RepresentationCount()); 205 EXPECT_EQ(1u, image.RepresentationCount());
206 EXPECT_EQ(2u, image.GetNumberOfSkBitmaps()); 206 EXPECT_EQ(2u, image.GetNumberOfSkBitmaps());
207 } 207 }
208 208
209 // Integration tests with UI toolkit frameworks require linking against the 209 // Integration tests with UI toolkit frameworks require linking against the
210 // Views library and cannot be here (gfx_unittests doesn't include it). They 210 // Views library and cannot be here (gfx_unittests doesn't include it). They
211 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc. 211 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
212 212
213 } // namespace 213 } // namespace
OLDNEW
« no previous file with comments | « ui/gfx/image.cc ('k') | ui/gfx/image_unittest_util.h » ('j') | ui/gfx/image_unittest_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698