content/browser/webui/web_ui_handler_browsertest.cc - Issue 6575054: WebUI: Move the core files of WebUI from chrome/browser/webui to content/webui.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/webui/web_ui_handler_browsertest.cc

Issue 6575054: WebUI: Move the core files of WebUI from chrome/browser/webui to content/webui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 9 years, 10 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

« no previous file with comments | « content/browser/webui/web_ui_handler_browsertest.h ('k') | content/browser/webui/web_ui_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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 "chrome/browser/webui/web_ui_handler_browsertest.h"	5 #include "content/browser/webui/web_ui_handler_browsertest.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/renderer_host/render_view_host.h"	8 #include "chrome/browser/renderer_host/render_view_host.h"

9 #include "chrome/test/ui_test_utils.h"	9 #include "chrome/test/ui_test_utils.h"

10	10

11 bool WebUIHandlerBrowserTest::Execute(const std::string& js_test) {	11 bool WebUIHandlerBrowserTest::Execute(const std::string& js_test) {

12 web_ui_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(	12 web_ui_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(

13 string16(), UTF8ToUTF16(js_test));	13 string16(), UTF8ToUTF16(js_test));

14 return WaitForResult();	14 return WaitForResult();

15 }	15 }

(...skipping 16 matching lines...) Expand all Loading...
32 web_ui_->RegisterMessageCallback("Fail",	32 web_ui_->RegisterMessageCallback("Fail",

33 NewCallback(this, &WebUIHandlerBrowserTest::HandleFail));	33 NewCallback(this, &WebUIHandlerBrowserTest::HandleFail));

34 }	34 }

35	35

36 bool WebUIHandlerBrowserTest::WaitForResult() {	36 bool WebUIHandlerBrowserTest::WaitForResult() {

37 is_waiting_ = true;	37 is_waiting_ = true;

38 ui_test_utils::RunMessageLoop();	38 ui_test_utils::RunMessageLoop();

39 is_waiting_ = false;	39 is_waiting_ = false;

40 return test_succeeded_;	40 return test_succeeded_;

41 }	41 }

OLD	NEW