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

Unified Diff: gfx/test_suite.h

Issue 6081007: Start sorting methods in class declarations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gfx/platform_font_gtk.h ('k') | gfx/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/test_suite.h
diff --git a/gfx/test_suite.h b/gfx/test_suite.h
index 8e09e35b6f8067aa957e58a53f420c9d8cd03308..7c6ffbd354a9359608caa4a8bfc20dee5f1feb95 100644
--- a/gfx/test_suite.h
+++ b/gfx/test_suite.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,55 +8,17 @@
#include <string>
-#include "gfx/gfx_paths.h"
-#include "base/file_path.h"
-#include "base/path_service.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
-#if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#endif
-
class GfxTestSuite : public base::TestSuite {
public:
- GfxTestSuite(int argc, char** argv) : TestSuite(argc, argv) {
- }
+ GfxTestSuite(int argc, char** argv);
protected:
-
- virtual void Initialize() {
- base::mac::ScopedNSAutoreleasePool autorelease_pool;
-
- TestSuite::Initialize();
-
- gfx::RegisterPathProvider();
-
-#if defined(OS_MACOSX)
- // Look in the framework bundle for resources.
- // TODO(port): make a resource bundle for non-app exes. What's done here
- // isn't really right because this code needs to depend on chrome_dll
- // being built. This is inappropriate in app.
- FilePath path;
- PathService::Get(base::DIR_EXE, &path);
-#if defined(GOOGLE_CHROME_BUILD)
- path = path.AppendASCII("Google Chrome Framework.framework");
-#elif defined(CHROMIUM_BUILD)
- path = path.AppendASCII("Chromium Framework.framework");
-#else
-#error Unknown branding
-#endif
- base::mac::SetOverrideAppBundlePath(path);
-#endif // OS_MACOSX
- }
-
- virtual void Shutdown() {
-#if defined(OS_MACOSX)
- base::mac::SetOverrideAppBundle(NULL);
-#endif
- TestSuite::Shutdown();
- }
+ // Overridden from base::TestSuite:
+ virtual void Initialize();
+ virtual void Shutdown();
};
#endif // GFX_TEST_SUITE_H_
« no previous file with comments | « gfx/platform_font_gtk.h ('k') | gfx/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698