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

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

Issue 5544002: Move a bunch more browser stuff around.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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/ui/browser.h ('k') | chrome/browser/ui/cocoa/back_forward_menu_controller.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 19 matching lines...) Expand all
30 #include "chrome/browser/bookmarks/bookmark_utils.h" 30 #include "chrome/browser/bookmarks/bookmark_utils.h"
31 #include "chrome/browser/browser_list.h" 31 #include "chrome/browser/browser_list.h"
32 #include "chrome/browser/browser_process.h" 32 #include "chrome/browser/browser_process.h"
33 #include "chrome/browser/browser_shutdown.h" 33 #include "chrome/browser/browser_shutdown.h"
34 #include "chrome/browser/browser_window.h" 34 #include "chrome/browser/browser_window.h"
35 #include "chrome/browser/browser_url_handler.h" 35 #include "chrome/browser/browser_url_handler.h"
36 #include "chrome/browser/character_encoding.h" 36 #include "chrome/browser/character_encoding.h"
37 #include "chrome/browser/debugger/devtools_manager.h" 37 #include "chrome/browser/debugger/devtools_manager.h"
38 #include "chrome/browser/debugger/devtools_toggle_action.h" 38 #include "chrome/browser/debugger/devtools_toggle_action.h"
39 #include "chrome/browser/debugger/devtools_window.h" 39 #include "chrome/browser/debugger/devtools_window.h"
40 #include "chrome/browser/dock_info.h"
41 #include "chrome/browser/dom_ui/filebrowse_ui.h" 40 #include "chrome/browser/dom_ui/filebrowse_ui.h"
42 #include "chrome/browser/dom_ui/options/content_settings_handler.h" 41 #include "chrome/browser/dom_ui/options/content_settings_handler.h"
43 #include "chrome/browser/download/download_item.h" 42 #include "chrome/browser/download/download_item.h"
44 #include "chrome/browser/download/download_item_model.h" 43 #include "chrome/browser/download/download_item_model.h"
45 #include "chrome/browser/download/download_manager.h" 44 #include "chrome/browser/download/download_manager.h"
46 #include "chrome/browser/download/download_shelf.h" 45 #include "chrome/browser/download/download_shelf.h"
47 #include "chrome/browser/download/download_started_animation.h" 46 #include "chrome/browser/download/download_started_animation.h"
48 #include "chrome/browser/extensions/crashed_extension_infobar.h" 47 #include "chrome/browser/extensions/crashed_extension_infobar.h"
49 #include "chrome/browser/extensions/crx_installer.h" 48 #include "chrome/browser/extensions/crx_installer.h"
50 #include "chrome/browser/extensions/extension_browser_event_router.h" 49 #include "chrome/browser/extensions/extension_browser_event_router.h"
(...skipping 29 matching lines...) Expand all
80 #include "chrome/browser/tab_contents/navigation_controller.h" 79 #include "chrome/browser/tab_contents/navigation_controller.h"
81 #include "chrome/browser/tab_contents/navigation_entry.h" 80 #include "chrome/browser/tab_contents/navigation_entry.h"
82 #include "chrome/browser/tab_contents/tab_contents.h" 81 #include "chrome/browser/tab_contents/tab_contents.h"
83 #include "chrome/browser/tab_contents/tab_contents_view.h" 82 #include "chrome/browser/tab_contents/tab_contents_view.h"
84 #include "chrome/browser/tab_contents_wrapper.h" 83 #include "chrome/browser/tab_contents_wrapper.h"
85 #include "chrome/browser/tab_menu_model.h" 84 #include "chrome/browser/tab_menu_model.h"
86 #include "chrome/browser/tabs/tab_strip_model.h" 85 #include "chrome/browser/tabs/tab_strip_model.h"
87 #include "chrome/browser/ui/browser_navigator.h" 86 #include "chrome/browser/ui/browser_navigator.h"
88 #include "chrome/browser/ui/find_bar/find_bar.h" 87 #include "chrome/browser/ui/find_bar/find_bar.h"
89 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 88 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
89 #include "chrome/browser/ui/tabs/dock_info.h"
90 #include "chrome/browser/ui/window_sizer.h"
90 #include "chrome/browser/upgrade_detector.h" 91 #include "chrome/browser/upgrade_detector.h"
91 #include "chrome/browser/web_applications/web_app.h" 92 #include "chrome/browser/web_applications/web_app.h"
92 #include "chrome/browser/window_sizer.h"
93 #include "chrome/common/chrome_constants.h" 93 #include "chrome/common/chrome_constants.h"
94 #include "chrome/common/chrome_switches.h" 94 #include "chrome/common/chrome_switches.h"
95 #include "chrome/common/content_restriction.h" 95 #include "chrome/common/content_restriction.h"
96 #include "chrome/common/extensions/extension.h" 96 #include "chrome/common/extensions/extension.h"
97 #include "chrome/common/notification_service.h" 97 #include "chrome/common/notification_service.h"
98 #include "chrome/common/page_transition_types.h" 98 #include "chrome/common/page_transition_types.h"
99 #include "chrome/common/pref_names.h" 99 #include "chrome/common/pref_names.h"
100 #include "chrome/common/url_constants.h" 100 #include "chrome/common/url_constants.h"
101 #include "chrome/common/web_apps.h" 101 #include "chrome/common/web_apps.h"
102 #include "grit/chromium_strings.h" 102 #include "grit/chromium_strings.h"
(...skipping 4039 matching lines...) Expand 10 before | Expand all | Expand 10 after
4142 NOTREACHED(); 4142 NOTREACHED();
4143 return false; 4143 return false;
4144 } 4144 }
4145 4145
4146 void Browser::CreateInstantIfNecessary() { 4146 void Browser::CreateInstantIfNecessary() {
4147 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && 4147 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
4148 !profile()->IsOffTheRecord()) { 4148 !profile()->IsOffTheRecord()) {
4149 instant_.reset(new InstantController(profile_, this)); 4149 instant_.reset(new InstantController(profile_, this));
4150 } 4150 }
4151 } 4151 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/cocoa/back_forward_menu_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698