| Index: chrome/browser/devtools/devtools_window.cc
|
| diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
|
| index 16ffe909dfb3463df09ef27d71737dae5f9eb2d4..b4104ce0d464eb2a7932886432047fbb37c4a14e 100644
|
| --- a/chrome/browser/devtools/devtools_window.cc
|
| +++ b/chrome/browser/devtools/devtools_window.cc
|
| @@ -159,7 +159,7 @@ void DevToolsToolboxDelegate::WebContentsDestroyed() {
|
|
|
| BrowserWindow* DevToolsToolboxDelegate::GetInspectedBrowserWindow() {
|
| WebContents* inspected_contents =
|
| - inspected_contents_observer_->GetWebContents();
|
| + inspected_contents_observer_->web_contents();
|
| if (!inspected_contents)
|
| return NULL;
|
| Browser* browser = NULL;
|
| @@ -292,10 +292,6 @@ DevToolsWindow::ObserverWithAccessor::ObserverWithAccessor(
|
| DevToolsWindow::ObserverWithAccessor::~ObserverWithAccessor() {
|
| }
|
|
|
| -WebContents* DevToolsWindow::ObserverWithAccessor::GetWebContents() {
|
| - return web_contents();
|
| -}
|
| -
|
| // DevToolsWindow -------------------------------------------------------------
|
|
|
| const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
|
| @@ -1217,8 +1213,9 @@ void DevToolsWindow::UpdateBrowserWindow() {
|
| }
|
|
|
| WebContents* DevToolsWindow::GetInspectedWebContents() {
|
| - return inspected_contents_observer_ ?
|
| - inspected_contents_observer_->GetWebContents() : NULL;
|
| + return inspected_contents_observer_
|
| + ? inspected_contents_observer_->web_contents()
|
| + : NULL;
|
| }
|
|
|
| void DevToolsWindow::LoadCompleted() {
|
|
|