Make WebContentsObserver::web_contents() public

chrome/browser/devtools/devtools_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
@@ skipping 141 matching lines @@
   if (window)
     window->HandleKeyboardEvent(event);
 }
 
 void DevToolsToolboxDelegate::WebContentsDestroyed() {
   delete this;
 }
 
 BrowserWindow* DevToolsToolboxDelegate::GetInspectedBrowserWindow() {
   WebContents* inspected_contents =
-      inspected_contents_observer_->GetWebContents();
+      inspected_contents_observer_->web_contents();
   if (!inspected_contents)
     return NULL;
   Browser* browser = NULL;
   int tab = 0;
   if (FindInspectedBrowserAndTabIndex(inspected_contents, &browser, &tab))
     return browser->window();
   return NULL;
 }
 
 }  // namespace
@@ skipping 112 matching lines @@
 // DevToolsWindow::ObserverWithAccessor -------------------------------
 
 DevToolsWindow::ObserverWithAccessor::ObserverWithAccessor(
     WebContents* web_contents)
     : WebContentsObserver(web_contents) {
 }
 
 DevToolsWindow::ObserverWithAccessor::~ObserverWithAccessor() {
 }
 
-WebContents* DevToolsWindow::ObserverWithAccessor::GetWebContents() {
-  return web_contents();
-}
-
 // DevToolsWindow -------------------------------------------------------------
 
 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
 
 DevToolsWindow::~DevToolsWindow() {
   life_stage_ = kClosing;
 
   UpdateBrowserWindow();
   UpdateBrowserToolbar();
 
@@ skipping 901 matching lines @@
     inspected_window->UpdateToolbar(NULL);
 }
 
 void DevToolsWindow::UpdateBrowserWindow() {
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateDevTools();
 }
 
 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() {
   Show(action_on_load_);
   action_on_load_ = DevToolsToggleAction::NoOp();
   if (!load_completed_callback_.is_null()) {
     load_completed_callback_.Run();
     load_completed_callback_ = base::Closure();
   }
 }
 
 void DevToolsWindow::SetLoadCompletedCallback(const base::Closure& closure) {
   if (life_stage_ == kLoadCompleted || life_stage_ == kClosing) {
     if (!closure.is_null())
       closure.Run();
     return;
   }
   load_completed_callback_ = closure;
 }
 
 bool DevToolsWindow::ForwardKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   return event_forwarder_->ForwardEvent(event);
 }