diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:11:51 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:11:51 +0000 |
| commit | 7f8aff5b10859950cf9a6996a5d3d288ea3c75f4 (patch) | |
| tree | 4b4416b01a582d0c1d7cb0beea1682f320eff3d4 /chrome | |
| parent | f2c859a17e291cd481f89b55b79ac5450a81fcd0 (diff) | |
| download | chromium_src-7f8aff5b10859950cf9a6996a5d3d288ea3c75f4.zip chromium_src-7f8aff5b10859950cf9a6996a5d3d288ea3c75f4.tar.gz chromium_src-7f8aff5b10859950cf9a6996a5d3d288ea3c75f4.tar.bz2 | |
Fix build. There was a merge problem between the first landing attempt and the second.
BUG=none
TEST=none
TBR=mirandac
Review URL: http://codereview.chromium.org/3751005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/constrained_html_dialog_browsertest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/views/constrained_html_dialog_browsertest.cc b/chrome/browser/views/constrained_html_dialog_browsertest.cc index 0ee6263..c868fb8 100644 --- a/chrome/browser/views/constrained_html_dialog_browsertest.cc +++ b/chrome/browser/views/constrained_html_dialog_browsertest.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if defined(OS_WIN) + #include "chrome/test/ui/ui_test.h" #include "base/file_path.h" #include "base/message_loop.h" -#include "chrome/browser/chrome_thread.h" +#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/constrained_html_dialog.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/tab_contents.h" -#if defined(OS_WIN) #include "chrome/browser/views/constrained_html_dialog_win.h" -#endif #include "chrome/browser/views/html_dialog_view.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" @@ -65,8 +65,6 @@ class TestHtmlDialogUIDelegate : public HtmlDialogUIDelegate { } // namespace -#if defined(OS_WIN) - class ConstrainedHtmlDialogBrowserTest : public InProcessBrowserTest { public: ConstrainedHtmlDialogBrowserTest() {} |