Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: chrome/browser/devtools/browser_list_tabcontents_provider.cc

Issue 101463005: Inline devtools_discovery_page_resources.grd into browser_resources.grd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h" 5 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "chrome/browser/devtools/devtools_target_impl.h" 9 #include "chrome/browser/devtools/devtools_target_impl.h"
10 #include "chrome/browser/history/top_sites.h" 10 #include "chrome/browser/history/top_sites.h"
11 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 13 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/browser_iterator.h" 14 #include "chrome/browser/ui/browser_iterator.h"
15 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
16 #include "chrome/browser/ui/browser_tabstrip.h" 16 #include "chrome/browser/ui/browser_tabstrip.h"
17 #include "chrome/browser/ui/host_desktop.h" 17 #include "chrome/browser/ui/host_desktop.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "content/public/common/url_constants.h" 22 #include "content/public/common/url_constants.h"
23 #include "grit/devtools_discovery_page_resources.h" 23 #include "grit/browser_resources.h"
24 #include "net/socket/tcp_listen_socket.h" 24 #include "net/socket/tcp_listen_socket.h"
25 #include "net/url_request/url_request_context_getter.h" 25 #include "net/url_request/url_request_context_getter.h"
26 #include "ui/base/resource/resource_bundle.h" 26 #include "ui/base/resource/resource_bundle.h"
27 27
28 using content::DevToolsTarget; 28 using content::DevToolsTarget;
29 using content::RenderViewHost; 29 using content::RenderViewHost;
30 using content::WebContents; 30 using content::WebContents;
31 31
32 BrowserListTabContentsProvider::BrowserListTabContentsProvider( 32 BrowserListTabContentsProvider::BrowserListTabContentsProvider(
33 chrome::HostDesktopType host_desktop_type) 33 chrome::HostDesktopType host_desktop_type)
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 .PassAs<net::StreamListenSocket>(); 132 .PassAs<net::StreamListenSocket>();
133 } 133 }
134 #else 134 #else
135 scoped_ptr<net::StreamListenSocket> 135 scoped_ptr<net::StreamListenSocket>
136 BrowserListTabContentsProvider::CreateSocketForTethering( 136 BrowserListTabContentsProvider::CreateSocketForTethering(
137 net::StreamListenSocket::Delegate* delegate, 137 net::StreamListenSocket::Delegate* delegate,
138 std::string* name) { 138 std::string* name) {
139 return scoped_ptr<net::StreamListenSocket>(); 139 return scoped_ptr<net::StreamListenSocket>();
140 } 140 }
141 #endif // defined(DEBUG_DEVTOOLS) 141 #endif // defined(DEBUG_DEVTOOLS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698