diff options
| author | lucinka.brozkova <lucinka.brozkova@gmail.com> | 2014-09-03 23:42:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 06:46:09 +0000 |
| commit | c25f7fb98990a08aa235d1cee10da982b9f4aecc (patch) | |
| tree | ade41ae2f486e8382ce3c63b47c455625677c94f /chrome/browser/devtools | |
| parent | 30975b8951c8c131883b0da0944b130fc8d1f2ae (diff) | |
| download | chromium_src-c25f7fb98990a08aa235d1cee10da982b9f4aecc.zip chromium_src-c25f7fb98990a08aa235d1cee10da982b9f4aecc.tar.gz chromium_src-c25f7fb98990a08aa235d1cee10da982b9f4aecc.tar.bz2 | |
Make WebContentsObserver::web_contents() public
WebContentsObserver::web_contents() is now public + cleanup of unnecessary getters.
BUG=408560
Review URL: https://codereview.chromium.org/525793002
Cr-Commit-Position: refs/heads/master@{#293274}
Diffstat (limited to 'chrome/browser/devtools')
| -rw-r--r-- | chrome/browser/devtools/devtools_window.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/devtools/devtools_window.h | 1 |
2 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 16ffe90..b4104ce 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() { diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h index 6562de7..7501c19 100644 --- a/chrome/browser/devtools/devtools_window.h +++ b/chrome/browser/devtools/devtools_window.h @@ -33,7 +33,6 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate, public: explicit ObserverWithAccessor(content::WebContents* web_contents); virtual ~ObserverWithAccessor(); - content::WebContents* GetWebContents(); private: DISALLOW_COPY_AND_ASSIGN(ObserverWithAccessor); |