diff options
Diffstat (limited to 'webkit/tools/test_shell/test_shell.h')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.h | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h index f00d38a..590a3b2 100644 --- a/webkit/tools/test_shell/test_shell.h +++ b/webkit/tools/test_shell/test_shell.h @@ -1,27 +1,6 @@ -/* - * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +// Copyright (c) 2012 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. #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ @@ -49,7 +28,10 @@ typedef std::list<gfx::NativeWindow> WindowList; +namespace webkit_glue { struct WebPreferences; +} + class GURL; class TestNavigationEntry; class TestNavigationController; @@ -234,7 +216,7 @@ public: static void SetAccelerated2dCanvasEnabled(bool enabled); static void SetAcceleratedCompositingEnabled(bool enabled); - static WebPreferences* GetWebPreferences(); + static webkit_glue::WebPreferences* GetWebPreferences(); // Some layout tests hardcode a file:///tmp/LayoutTests URL. We get around // this by substituting "tmp" with the path to the LayoutTests parent dir. @@ -425,7 +407,7 @@ private: bool allow_scripts_; // The preferences for the test shell. - static WebPreferences* web_prefs_; + static webkit_glue::WebPreferences* web_prefs_; #if defined(OS_WIN) // Used by the watchdog to know when it's finished. |