summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 00:13:15 +0000
committertengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 00:13:15 +0000
commitcc5110ade0488b8c10fbe47040ecc5ede0b14212 (patch)
tree778557cc0ad7216f6dc1aff17faa0213979883bc /chrome
parent4e1272f40f7ca5832078d9d8ed4b5c875bfcb774 (diff)
downloadchromium_src-cc5110ade0488b8c10fbe47040ecc5ede0b14212.zip
chromium_src-cc5110ade0488b8c10fbe47040ecc5ede0b14212.tar.gz
chromium_src-cc5110ade0488b8c10fbe47040ecc5ede0b14212.tar.bz2
Remove reference to profile in devtools remote debugging initialization.
Use GetLastUsedProfile instead, so we can get the user profile after logging in on CrOS. BUG=242354 TEST=run_tests on CrOS Review URL: https://chromiumcodereview.appspot.com/15305014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_process.h1
-rw-r--r--chrome/browser/browser_process_impl.cc3
-rw-r--r--chrome/browser/browser_process_impl.h1
-rw-r--r--chrome/browser/chrome_browser_main.cc6
-rw-r--r--chrome/browser/devtools/browser_list_tabcontents_provider.cc7
-rw-r--r--chrome/browser/devtools/browser_list_tabcontents_provider.h7
-rw-r--r--chrome/browser/devtools/remote_debugging_server.cc3
-rw-r--r--chrome/browser/devtools/remote_debugging_server.h5
-rw-r--r--chrome/test/base/testing_browser_process.cc1
-rw-r--r--chrome/test/base/testing_browser_process.h1
10 files changed, 10 insertions, 25 deletions
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 408be3a..004fdee 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -145,7 +145,6 @@ class BrowserProcess {
virtual AutomationProviderList* GetAutomationProviderList() = 0;
virtual void CreateDevToolsHttpProtocolHandler(
- Profile* profile,
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
int port,
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index da667f0..f63c5a0 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -528,7 +528,6 @@ AutomationProviderList* BrowserProcessImpl::GetAutomationProviderList() {
}
void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler(
- Profile* profile,
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
int port,
@@ -539,7 +538,7 @@ void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler(
// is started with several profiles or existing browser process is reused.
if (!remote_debugging_server_.get()) {
remote_debugging_server_.reset(
- new RemoteDebuggingServer(profile, host_desktop_type, ip, port,
+ new RemoteDebuggingServer(host_desktop_type, ip, port,
frontend_url));
}
#endif
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 0479e31..e80b4fb 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -92,7 +92,6 @@ class BrowserProcessImpl : public BrowserProcess,
virtual RenderWidgetSnapshotTaker* GetRenderWidgetSnapshotTaker() OVERRIDE;
virtual AutomationProviderList* GetAutomationProviderList() OVERRIDE;
virtual void CreateDevToolsHttpProtocolHandler(
- Profile* profile,
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
int port,
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 04149e7..e341805 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -471,8 +471,7 @@ bool ProcessSingletonNotificationCallback(
return true;
}
-void LaunchDevToolsHandlerIfNeeded(Profile* profile,
- const CommandLine& command_line) {
+void LaunchDevToolsHandlerIfNeeded(const CommandLine& command_line) {
if (command_line.HasSwitch(::switches::kRemoteDebuggingPort)) {
std::string port_str =
command_line.GetSwitchValueASCII(::switches::kRemoteDebuggingPort);
@@ -484,7 +483,6 @@ void LaunchDevToolsHandlerIfNeeded(Profile* profile,
::switches::kRemoteDebuggingFrontend);
}
g_browser_process->CreateDevToolsHttpProtocolHandler(
- profile,
chrome::HOST_DESKTOP_TYPE_NATIVE,
"127.0.0.1",
port,
@@ -1037,7 +1035,7 @@ void ChromeBrowserMainParts::PreProfileInit() {
void ChromeBrowserMainParts::PostProfileInit() {
TRACE_EVENT0("startup", "ChromeBrowserMainParts::PostProfileInit");
- LaunchDevToolsHandlerIfNeeded(profile(), parsed_command_line());
+ LaunchDevToolsHandlerIfNeeded(parsed_command_line());
for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
chrome_extra_parts_[i]->PostProfileInit();
}
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index e9de6bb..08a462a 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/history/top_sites.h"
-#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
@@ -32,9 +31,8 @@ using content::DevToolsHttpHandlerDelegate;
using content::RenderViewHost;
BrowserListTabContentsProvider::BrowserListTabContentsProvider(
- Profile* profile,
chrome::HostDesktopType host_desktop_type)
- : profile_(profile), host_desktop_type_(host_desktop_type) {
+ : host_desktop_type_(host_desktop_type) {
}
BrowserListTabContentsProvider::~BrowserListTabContentsProvider() {
@@ -93,7 +91,8 @@ RenderViewHost* BrowserListTabContentsProvider::CreateNewTarget() {
BrowserList::GetInstance(host_desktop_type_);
if (browser_list->empty()) {
- chrome::NewEmptyWindow(profile_, host_desktop_type_);
+ chrome::NewEmptyWindow(ProfileManager::GetLastUsedProfile(),
+ host_desktop_type_);
return browser_list->empty() ? NULL :
browser_list->get(0)->tab_strip_model()->GetActiveWebContents()->
GetRenderViewHost();
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.h b/chrome/browser/devtools/browser_list_tabcontents_provider.h
index 664d907..7994772 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.h
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.h
@@ -13,13 +13,11 @@
#include "chrome/browser/ui/host_desktop.h"
#include "content/public/browser/devtools_http_handler_delegate.h"
-class Profile;
-
class BrowserListTabContentsProvider
: public content::DevToolsHttpHandlerDelegate {
public:
- BrowserListTabContentsProvider(Profile* profile,
- chrome::HostDesktopType host_desktop_type);
+ explicit BrowserListTabContentsProvider(
+ chrome::HostDesktopType host_desktop_type);
virtual ~BrowserListTabContentsProvider();
// DevToolsHttpProtocolHandler::Delegate overrides.
@@ -35,7 +33,6 @@ class BrowserListTabContentsProvider
std::string* name) OVERRIDE;
private:
- Profile* profile_;
chrome::HostDesktopType host_desktop_type_;
DISALLOW_COPY_AND_ASSIGN(BrowserListTabContentsProvider);
};
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index 1068c94..50e43e7 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -10,7 +10,6 @@
#include "net/socket/tcp_listen_socket.h"
RemoteDebuggingServer::RemoteDebuggingServer(
- Profile* profile,
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
int port,
@@ -18,7 +17,7 @@ RemoteDebuggingServer::RemoteDebuggingServer(
devtools_http_handler_ = content::DevToolsHttpHandler::Start(
new net::TCPListenSocketFactory(ip, port),
frontend_url,
- new BrowserListTabContentsProvider(profile, host_desktop_type));
+ new BrowserListTabContentsProvider(host_desktop_type));
}
RemoteDebuggingServer::~RemoteDebuggingServer() {
diff --git a/chrome/browser/devtools/remote_debugging_server.h b/chrome/browser/devtools/remote_debugging_server.h
index 6618023..11b2b19 100644
--- a/chrome/browser/devtools/remote_debugging_server.h
+++ b/chrome/browser/devtools/remote_debugging_server.h
@@ -10,16 +10,13 @@
#include "base/basictypes.h"
#include "chrome/browser/ui/host_desktop.h"
-class Profile;
-
namespace content {
class DevToolsHttpHandler;
}
class RemoteDebuggingServer {
public:
- RemoteDebuggingServer(Profile* profile,
- chrome::HostDesktopType host_desktop_type,
+ RemoteDebuggingServer(chrome::HostDesktopType host_desktop_type,
const std::string& ip,
int port,
const std::string& frontend_url);
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 01f653f5..75cc12c 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -205,7 +205,6 @@ AutomationProviderList* TestingBrowserProcess::GetAutomationProviderList() {
}
void TestingBrowserProcess::CreateDevToolsHttpProtocolHandler(
- Profile* profile,
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
int port,
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index c23e851..3f07bec 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -76,7 +76,6 @@ class TestingBrowserProcess : public BrowserProcess {
virtual IntranetRedirectDetector* intranet_redirect_detector() OVERRIDE;
virtual AutomationProviderList* GetAutomationProviderList() OVERRIDE;
virtual void CreateDevToolsHttpProtocolHandler(
- Profile* profile,
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
int port,
generated by cgit v1.1 at 2025-03-26 01:00:19 +0000