OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/string_util.h" | 5 #include "base/string_util.h" |
6 #include "chrome/browser/browser_about_handler.h" | 6 #include "chrome/browser/browser_about_handler.h" |
7 #include "chrome/browser/browser_url_handler.h" | 7 #include "chrome/browser/browser_url_handler.h" |
8 #include "chrome/browser/dom_ui/dom_ui_contents.h" | 8 #include "chrome/browser/dom_ui/dom_ui_contents.h" |
9 #include "chrome/browser/dom_ui/html_dialog_contents.h" | 9 #include "chrome/browser/dom_ui/html_dialog_contents.h" |
10 #include "chrome/browser/dom_ui/new_tab_ui.h" | 10 #include "chrome/browser/dom_ui/new_tab_ui.h" |
11 #include "chrome/browser/profile.h" | 11 #include "chrome/browser/profile.h" |
12 #include "chrome/browser/renderer_host/render_process_host.h" | 12 #include "chrome/browser/renderer_host/render_process_host.h" |
13 #include "chrome/browser/debugger/debugger_contents.h" | 13 #include "chrome/browser/debugger/debugger_contents.h" |
14 #include "chrome/browser/tab_contents/about_internets_status_view.h" | |
15 #include "chrome/browser/tab_contents/ipc_status_view.h" | 14 #include "chrome/browser/tab_contents/ipc_status_view.h" |
16 #include "chrome/browser/tab_contents/native_ui_contents.h" | 15 #include "chrome/browser/tab_contents/native_ui_contents.h" |
17 #include "chrome/browser/tab_contents/network_status_view.h" | 16 #include "chrome/browser/tab_contents/network_status_view.h" |
18 #include "chrome/browser/tab_contents/tab_contents.h" | 17 #include "chrome/browser/tab_contents/tab_contents.h" |
19 #include "chrome/browser/tab_contents/tab_contents_factory.h" | 18 #include "chrome/browser/tab_contents/tab_contents_factory.h" |
20 #include "chrome/browser/tab_contents/view_source_contents.h" | 19 #include "chrome/browser/tab_contents/view_source_contents.h" |
21 #include "chrome/browser/tab_contents/web_contents.h" | 20 #include "chrome/browser/tab_contents/web_contents.h" |
22 #include "net/base/net_util.h" | 21 #include "net/base/net_util.h" |
23 | 22 |
24 typedef std::map<TabContentsType, TabContentsFactory*> TabContentsFactoryMap; | 23 typedef std::map<TabContentsType, TabContentsFactory*> TabContentsFactoryMap; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 #endif | 55 #endif |
57 case TAB_CONTENTS_NEW_TAB_UI: | 56 case TAB_CONTENTS_NEW_TAB_UI: |
58 contents = new NewTabUIContents(profile, instance, NULL); | 57 contents = new NewTabUIContents(profile, instance, NULL); |
59 break; | 58 break; |
60 case TAB_CONTENTS_HTML_DIALOG: | 59 case TAB_CONTENTS_HTML_DIALOG: |
61 contents = new HtmlDialogContents(profile, instance, NULL); | 60 contents = new HtmlDialogContents(profile, instance, NULL); |
62 break; | 61 break; |
63 case TAB_CONTENTS_NATIVE_UI: | 62 case TAB_CONTENTS_NATIVE_UI: |
64 contents = new NativeUIContents(profile); | 63 contents = new NativeUIContents(profile); |
65 break; | 64 break; |
66 case TAB_CONTENTS_ABOUT_INTERNETS_STATUS_VIEW: | |
67 contents = new AboutInternetsStatusView(); | |
68 break; | |
69 case TAB_CONTENTS_VIEW_SOURCE: | 65 case TAB_CONTENTS_VIEW_SOURCE: |
70 contents = new ViewSourceContents(profile, instance); | 66 contents = new ViewSourceContents(profile, instance); |
71 break; | 67 break; |
72 case TAB_CONTENTS_ABOUT_UI: | 68 case TAB_CONTENTS_ABOUT_UI: |
73 contents = new BrowserAboutHandler(profile, instance, NULL); | 69 contents = new BrowserAboutHandler(profile, instance, NULL); |
74 break; | 70 break; |
75 case TAB_CONTENTS_DEBUGGER: | 71 case TAB_CONTENTS_DEBUGGER: |
76 contents = new DebuggerContents(profile, instance); | 72 contents = new DebuggerContents(profile, instance); |
77 break; | 73 break; |
78 case TAB_CONTENTS_DOM_UI: | 74 case TAB_CONTENTS_DOM_UI: |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 g_extra_types->erase(type); | 148 g_extra_types->erase(type); |
153 if (g_extra_types->empty()) { | 149 if (g_extra_types->empty()) { |
154 delete g_extra_types; | 150 delete g_extra_types; |
155 g_extra_types = NULL; | 151 g_extra_types = NULL; |
156 } | 152 } |
157 } | 153 } |
158 | 154 |
159 return prev_factory; | 155 return prev_factory; |
160 } | 156 } |
161 | 157 |
OLD | NEW |