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

Side by Side Diff: chrome/browser/dom_ui/net_internals_ui.cc

Issue 6485017: Carnitas: move browser/ui/shell_dialogs.{h,cc} to browser/ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 2 more cases Created 9 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/dom_ui/net_internals_ui.h" 5 #include "chrome/browser/dom_ui/net_internals_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/browser_thread.h" 22 #include "chrome/browser/browser_thread.h"
23 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 23 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
24 #include "chrome/browser/io_thread.h" 24 #include "chrome/browser/io_thread.h"
25 #include "chrome/browser/net/chrome_net_log.h" 25 #include "chrome/browser/net/chrome_net_log.h"
26 #include "chrome/browser/net/connection_tester.h" 26 #include "chrome/browser/net/connection_tester.h"
27 #include "chrome/browser/net/passive_log_collector.h" 27 #include "chrome/browser/net/passive_log_collector.h"
28 #include "chrome/browser/net/url_fixer_upper.h" 28 #include "chrome/browser/net/url_fixer_upper.h"
29 #include "chrome/browser/platform_util.h" 29 #include "chrome/browser/platform_util.h"
30 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/shell_dialogs.h"
32 #include "chrome/browser/tab_contents/tab_contents.h" 31 #include "chrome/browser/tab_contents/tab_contents.h"
33 #include "chrome/browser/tab_contents/tab_contents_view.h" 32 #include "chrome/browser/tab_contents/tab_contents_view.h"
33 #include "chrome/browser/ui/shell_dialogs.h"
34 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
35 #include "chrome/common/chrome_version_info.h" 35 #include "chrome/common/chrome_version_info.h"
36 #include "chrome/common/jstemplate_builder.h" 36 #include "chrome/common/jstemplate_builder.h"
37 #include "chrome/common/net/url_request_context_getter.h" 37 #include "chrome/common/net/url_request_context_getter.h"
38 #include "chrome/common/url_constants.h" 38 #include "chrome/common/url_constants.h"
39 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
40 #include "grit/net_internals_resources.h" 40 #include "grit/net_internals_resources.h"
41 #include "net/base/escape.h" 41 #include "net/base/escape.h"
42 #include "net/base/host_resolver_impl.h" 42 #include "net/base/host_resolver_impl.h"
43 #include "net/base/net_errors.h" 43 #include "net/base/net_errors.h"
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after
1219 //////////////////////////////////////////////////////////////////////////////// 1219 ////////////////////////////////////////////////////////////////////////////////
1220 1220
1221 NetInternalsUI::NetInternalsUI(TabContents* contents) : WebUI(contents) { 1221 NetInternalsUI::NetInternalsUI(TabContents* contents) : WebUI(contents) {
1222 AddMessageHandler((new NetInternalsMessageHandler())->Attach(this)); 1222 AddMessageHandler((new NetInternalsMessageHandler())->Attach(this));
1223 1223
1224 NetInternalsHTMLSource* html_source = new NetInternalsHTMLSource(); 1224 NetInternalsHTMLSource* html_source = new NetInternalsHTMLSource();
1225 1225
1226 // Set up the chrome://net-internals/ source. 1226 // Set up the chrome://net-internals/ source.
1227 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source); 1227 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
1228 } 1228 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.h ('k') | chrome/browser/dom_ui/options/advanced_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698