| Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| index 00e66d1a22ebedf896e3ce33561b78418037f005..5e3f1adc3c4a76a4061f1bafdb69518de06cf43e 100644
|
| --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
|
| @@ -648,18 +648,17 @@ bool GetFrameFunction::RunImpl() {
|
|
|
| SetResult(Value::CreateNullValue());
|
|
|
| - TabContents* tab_contents;
|
| + content::WebContents* web_contents;
|
| if (!ExtensionTabUtil::GetTabById(tab_id,
|
| profile(),
|
| include_incognito(),
|
| NULL, NULL,
|
| - &tab_contents,
|
| + &web_contents,
|
| NULL) ||
|
| - !tab_contents) {
|
| + !web_contents) {
|
| return true;
|
| }
|
|
|
| - content::WebContents* web_contents = tab_contents->web_contents();
|
| WebNavigationTabObserver* observer =
|
| WebNavigationTabObserver::Get(web_contents);
|
| DCHECK(observer);
|
| @@ -703,18 +702,17 @@ bool GetAllFramesFunction::RunImpl() {
|
|
|
| SetResult(Value::CreateNullValue());
|
|
|
| - TabContents* tab_contents;
|
| + content::WebContents* web_contents;
|
| if (!ExtensionTabUtil::GetTabById(tab_id,
|
| profile(),
|
| include_incognito(),
|
| NULL, NULL,
|
| - &tab_contents,
|
| + &web_contents,
|
| NULL) ||
|
| - !tab_contents) {
|
| + !web_contents) {
|
| return true;
|
| }
|
|
|
| - content::WebContents* web_contents = tab_contents->web_contents();
|
| WebNavigationTabObserver* observer =
|
| WebNavigationTabObserver::Get(web_contents);
|
| DCHECK(observer);
|
|
|