chrome/browser/ui/browser.cc - Issue 6713082: Move WebUIFactory to chrome/browser.

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 6713082: Move WebUIFactory to chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ContentWebUIClient Created 9 years, 9 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

« no previous file with comments | « chrome/browser/tab_contents/render_view_host_delegate_helper.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | content/browser/tab_contents/tab_contents.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/ui/browser.h"	5 #include "chrome/browser/ui/browser.h"

6	6

7 #if defined(OS_WIN)	7 #if defined(OS_WIN)

8 #include <shellapi.h>	8 #include <shellapi.h>

9 #include <windows.h>	9 #include <windows.h>

10 #endif // OS_WIN	10 #endif // OS_WIN

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 #include "chrome/browser/ui/options/options_window.h"	78 #include "chrome/browser/ui/options/options_window.h"

79 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"	79 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"

80 #include "chrome/browser/ui/status_bubble.h"	80 #include "chrome/browser/ui/status_bubble.h"

81 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	81 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

82 #include "chrome/browser/ui/tabs/dock_info.h"	82 #include "chrome/browser/ui/tabs/dock_info.h"

83 #include "chrome/browser/ui/tabs/tab_menu_model.h"	83 #include "chrome/browser/ui/tabs/tab_menu_model.h"

84 #include "chrome/browser/ui/web_applications/web_app_ui.h"	84 #include "chrome/browser/ui/web_applications/web_app_ui.h"

85 #include "chrome/browser/ui/webui/bug_report_ui.h"	85 #include "chrome/browser/ui/webui/bug_report_ui.h"

86 #include "chrome/browser/ui/webui/filebrowse_ui.h"	86 #include "chrome/browser/ui/webui/filebrowse_ui.h"

87 #include "chrome/browser/ui/webui/options/content_settings_handler.h"	87 #include "chrome/browser/ui/webui/options/content_settings_handler.h"

	88 #include "chrome/browser/ui/webui/web_ui_factory.h"

88 #include "chrome/browser/ui/window_sizer.h"	89 #include "chrome/browser/ui/window_sizer.h"

89 #include "chrome/browser/upgrade_detector.h"	90 #include "chrome/browser/upgrade_detector.h"

90 #include "chrome/browser/web_applications/web_app.h"	91 #include "chrome/browser/web_applications/web_app.h"

91 #include "chrome/common/chrome_constants.h"	92 #include "chrome/common/chrome_constants.h"

92 #include "chrome/common/chrome_switches.h"	93 #include "chrome/common/chrome_switches.h"

93 #include "chrome/common/content_restriction.h"	94 #include "chrome/common/content_restriction.h"

94 #include "chrome/common/extensions/extension.h"	95 #include "chrome/common/extensions/extension.h"

95 #include "chrome/common/extensions/extension_constants.h"	96 #include "chrome/common/extensions/extension_constants.h"

96 #include "chrome/common/pref_names.h"	97 #include "chrome/common/pref_names.h"

97 #include "chrome/common/profiling.h"	98 #include "chrome/common/profiling.h"

(...skipping 4332 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4430 // The page transition below is only for the purpose of inserting the tab.	4431 // The page transition below is only for the purpose of inserting the tab.

4431 browser->AddTab(view_source_contents, PageTransition::LINK);	4432 browser->AddTab(view_source_contents, PageTransition::LINK);

4432 }	4433 }

4433	4434

4434 if (profile_->HasSessionService()) {	4435 if (profile_->HasSessionService()) {

4435 SessionService* session_service = profile_->GetSessionService();	4436 SessionService* session_service = profile_->GetSessionService();

4436 if (session_service)	4437 if (session_service)

4437 session_service->TabRestored(&view_source_contents->controller(), false);	4438 session_service->TabRestored(&view_source_contents->controller(), false);

4438 }	4439 }

4439 }	4440 }

OLD	NEW