chrome/browser/chromeos/login/screen_locker_tester.cc - Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

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

Unified Diff: chrome/browser/chromeos/login/screen_locker_tester.cc

Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years 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 | « chrome/browser/chromeos/accessibility/accessibility_util.cc ('k') | chrome/browser/extensions/extension_install_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screen_locker_tester.cc

===================================================================

--- chrome/browser/chromeos/login/screen_locker_tester.cc (revision 116011)

+++ chrome/browser/chromeos/login/screen_locker_tester.cc (working copy)

@@ -16,8 +16,8 @@

#include "chrome/browser/chromeos/login/webui_screen_locker.h"

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

#include "content/browser/renderer_host/render_view_host.h"

-#include "content/browser/tab_contents/tab_contents.h"

#include "content/browser/webui/web_ui.h"

+#include "content/public/browser/web_contents.h"

#include "ui/views/controls/button/button.h"

#include "ui/views/controls/label.h"

#include "ui/views/controls/textfield/textfield.h"

@@ -29,6 +29,8 @@

#include "chrome/browser/chromeos/login/lock_window_gtk.h"

#endif

+using content::WebContents;

namespace {

class LoginAttemptObserver : public chromeos::LoginStatusConsumer {

@@ -168,7 +170,7 @@

base::Value* WebUIScreenLockerTester::ExecuteJavascriptAndGetValue(

const std::string& js_text) {

- RenderViewHost* rvh = webui()->tab_contents()->GetRenderViewHost();

+ RenderViewHost* rvh = webui()->web_contents()->GetRenderViewHost();

return rvh->ExecuteJavascriptAndGetValue(string16(),

ASCIIToUTF16(js_text));

}

« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_util.cc ('k') | chrome/browser/extensions/extension_install_ui.cc » ('j') | no next file with comments »