diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 20:10:45 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 20:10:45 +0000 |
commit | ddb1e5ae096bd91da721887fd55e68c603bf7067 (patch) | |
tree | 401d9a379ff03bb8b69a1ce9c23fe182f673f587 /chrome/browser/debugger | |
parent | 1c9526e0650a91e412d815417634c9f193b1a4d5 (diff) | |
download | chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.zip chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.gz chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.bz2 |
Even more virtual method deinlining.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/5741001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
-rw-r--r-- | chrome/browser/debugger/devtools_client_host.cc | 16 | ||||
-rw-r--r-- | chrome/browser/debugger/devtools_client_host.h | 9 | ||||
-rw-r--r-- | chrome/browser/debugger/devtools_remote_listen_socket.cc | 4 | ||||
-rw-r--r-- | chrome/browser/debugger/devtools_remote_listen_socket.h | 2 | ||||
-rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 4 | ||||
-rw-r--r-- | chrome/browser/debugger/devtools_window.h | 2 |
6 files changed, 28 insertions, 9 deletions
diff --git a/chrome/browser/debugger/devtools_client_host.cc b/chrome/browser/debugger/devtools_client_host.cc new file mode 100644 index 0000000..f619bfb --- /dev/null +++ b/chrome/browser/debugger/devtools_client_host.cc @@ -0,0 +1,16 @@ +// Copyright (c) 2009 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/debugger/devtools_client_host.h" + +DevToolsWindow* DevToolsClientHost::AsDevToolsWindow() { + return NULL; +} + +void DevToolsClientHost::NotifyCloseListener() { + if (close_listener_) { + close_listener_->ClientHostClosing(this); + close_listener_ = NULL; + } +} diff --git a/chrome/browser/debugger/devtools_client_host.h b/chrome/browser/debugger/devtools_client_host.h index e62237d..952f532 100644 --- a/chrome/browser/debugger/devtools_client_host.h +++ b/chrome/browser/debugger/devtools_client_host.h @@ -41,19 +41,14 @@ class DevToolsClientHost { close_listener_ = listener; } - virtual DevToolsWindow* AsDevToolsWindow() { return NULL; } + virtual DevToolsWindow* AsDevToolsWindow(); protected: DevToolsClientHost() : close_listener_(NULL) {} // Should be called when the devtools client is going to die and this // DevToolsClientHost should not be used anymore. - void NotifyCloseListener() { - if (close_listener_) { - close_listener_->ClientHostClosing(this); - close_listener_ = NULL; - } - } + void NotifyCloseListener(); private: CloseListener* close_listener_; diff --git a/chrome/browser/debugger/devtools_remote_listen_socket.cc b/chrome/browser/debugger/devtools_remote_listen_socket.cc index 8ea1821..3ac15ae 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket.cc +++ b/chrome/browser/debugger/devtools_remote_listen_socket.cc @@ -206,6 +206,10 @@ void DevToolsRemoteListenSocket::HandleMessage() { } } +void DevToolsRemoteListenSocket::Listen() { + ListenSocket::Listen(); +} + void DevToolsRemoteListenSocket::Accept() { SOCKET conn = ListenSocket::Accept(socket_); if (conn != INVALID_SOCKET) { diff --git a/chrome/browser/debugger/devtools_remote_listen_socket.h b/chrome/browser/debugger/devtools_remote_listen_socket.h index 5497861..28c3f1f 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket.h +++ b/chrome/browser/debugger/devtools_remote_listen_socket.h @@ -26,7 +26,7 @@ class DevToolsRemoteListenSocket : public ListenSocket, DevToolsRemoteListener* message_listener); protected: - virtual void Listen() { ListenSocket::Listen(); } + virtual void Listen(); virtual void Accept(); virtual void Close(); virtual void SendInternal(const char* bytes, int len); diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 51aa1e6..bef546d 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -392,6 +392,10 @@ void DevToolsWindow::UpdateTheme() { ExecuteJavascriptInWebFrame(L"", UTF8ToWide(command)); } +bool DevToolsWindow::CanReloadContents(TabContents* source) const { + return false; +} + bool DevToolsWindow::PreHandleKeyboardEvent( const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { if (docked_) { diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index a9ba40d..71c8871 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -88,7 +88,7 @@ class DevToolsWindow virtual void LoadingStateChanged(TabContents* source) {} virtual void CloseContents(TabContents* source) {} virtual void MoveContents(TabContents* source, const gfx::Rect& pos) {} - virtual bool CanReloadContents(TabContents* source) const { return false; } + virtual bool CanReloadContents(TabContents* source) const; virtual void URLStarredChanged(TabContents* source, bool starred) {} virtual void UpdateTargetURL(TabContents* source, const GURL& url) {} virtual void ToolbarSizeChanged(TabContents* source, bool is_animating) {} |