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

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

Issue 6532045: WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 16 matching lines...) Expand all
27 #include "chrome/browser/bookmarks/bookmark_utils.h" 27 #include "chrome/browser/bookmarks/bookmark_utils.h"
28 #include "chrome/browser/browser_list.h" 28 #include "chrome/browser/browser_list.h"
29 #include "chrome/browser/browser_process.h" 29 #include "chrome/browser/browser_process.h"
30 #include "chrome/browser/browser_shutdown.h" 30 #include "chrome/browser/browser_shutdown.h"
31 #include "chrome/browser/browser_url_handler.h" 31 #include "chrome/browser/browser_url_handler.h"
32 #include "chrome/browser/browser_window.h" 32 #include "chrome/browser/browser_window.h"
33 #include "chrome/browser/character_encoding.h" 33 #include "chrome/browser/character_encoding.h"
34 #include "chrome/browser/debugger/devtools_manager.h" 34 #include "chrome/browser/debugger/devtools_manager.h"
35 #include "chrome/browser/debugger/devtools_toggle_action.h" 35 #include "chrome/browser/debugger/devtools_toggle_action.h"
36 #include "chrome/browser/debugger/devtools_window.h" 36 #include "chrome/browser/debugger/devtools_window.h"
37 #include "chrome/browser/dom_ui/filebrowse_ui.h"
38 #include "chrome/browser/dom_ui/options/content_settings_handler.h" 37 #include "chrome/browser/dom_ui/options/content_settings_handler.h"
39 #include "chrome/browser/download/download_item.h" 38 #include "chrome/browser/download/download_item.h"
40 #include "chrome/browser/download/download_item_model.h" 39 #include "chrome/browser/download/download_item_model.h"
41 #include "chrome/browser/download/download_manager.h" 40 #include "chrome/browser/download/download_manager.h"
42 #include "chrome/browser/download/download_shelf.h" 41 #include "chrome/browser/download/download_shelf.h"
43 #include "chrome/browser/download/download_started_animation.h" 42 #include "chrome/browser/download/download_started_animation.h"
44 #include "chrome/browser/extensions/crashed_extension_infobar.h" 43 #include "chrome/browser/extensions/crashed_extension_infobar.h"
45 #include "chrome/browser/extensions/crx_installer.h" 44 #include "chrome/browser/extensions/crx_installer.h"
46 #include "chrome/browser/extensions/extension_browser_event_router.h" 45 #include "chrome/browser/extensions/extension_browser_event_router.h"
47 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" 46 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #include "chrome/browser/ui/options/options_window.h" 83 #include "chrome/browser/ui/options/options_window.h"
85 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h" 84 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
86 #include "chrome/browser/ui/status_bubble.h" 85 #include "chrome/browser/ui/status_bubble.h"
87 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 86 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
88 #include "chrome/browser/ui/tabs/dock_info.h" 87 #include "chrome/browser/ui/tabs/dock_info.h"
89 #include "chrome/browser/ui/tabs/tab_menu_model.h" 88 #include "chrome/browser/ui/tabs/tab_menu_model.h"
90 #include "chrome/browser/ui/window_sizer.h" 89 #include "chrome/browser/ui/window_sizer.h"
91 #include "chrome/browser/upgrade_detector.h" 90 #include "chrome/browser/upgrade_detector.h"
92 #include "chrome/browser/web_applications/web_app.h" 91 #include "chrome/browser/web_applications/web_app.h"
93 #include "chrome/browser/webui/bug_report_ui.h" 92 #include "chrome/browser/webui/bug_report_ui.h"
93 #include "chrome/browser/webui/filebrowse_ui.h"
94 #include "chrome/common/chrome_constants.h" 94 #include "chrome/common/chrome_constants.h"
95 #include "chrome/common/chrome_switches.h" 95 #include "chrome/common/chrome_switches.h"
96 #include "chrome/common/content_restriction.h" 96 #include "chrome/common/content_restriction.h"
97 #include "chrome/common/extensions/extension.h" 97 #include "chrome/common/extensions/extension.h"
98 #include "chrome/common/extensions/extension_constants.h" 98 #include "chrome/common/extensions/extension_constants.h"
99 #include "chrome/common/notification_service.h" 99 #include "chrome/common/notification_service.h"
100 #include "chrome/common/page_transition_types.h" 100 #include "chrome/common/page_transition_types.h"
101 #include "chrome/common/pref_names.h" 101 #include "chrome/common/pref_names.h"
102 #include "chrome/common/profiling.h" 102 #include "chrome/common/profiling.h"
103 #include "chrome/common/url_constants.h" 103 #include "chrome/common/url_constants.h"
(...skipping 4272 matching lines...) Expand 10 before | Expand all | Expand 10 after
4376 // The page transition below is only for the purpose of inserting the tab. 4376 // The page transition below is only for the purpose of inserting the tab.
4377 browser->AddTab(view_source_contents, PageTransition::LINK); 4377 browser->AddTab(view_source_contents, PageTransition::LINK);
4378 } 4378 }
4379 4379
4380 if (profile_->HasSessionService()) { 4380 if (profile_->HasSessionService()) {
4381 SessionService* session_service = profile_->GetSessionService(); 4381 SessionService* session_service = profile_->GetSessionService();
4382 if (session_service) 4382 if (session_service)
4383 session_service->TabRestored(&view_source_contents->controller(), false); 4383 session_service->TabRestored(&view_source_contents->controller(), false);
4384 } 4384 }
4385 } 4385 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698