| OLD | NEW |
| 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/browser.h" | 5 #include "chrome/browser/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 14 matching lines...) Expand all Loading... |
| 25 #include "base/utf_string_conversions.h" | 25 #include "base/utf_string_conversions.h" |
| 26 #include "gfx/point.h" | 26 #include "gfx/point.h" |
| 27 #include "chrome/app/chrome_command_ids.h" | 27 #include "chrome/app/chrome_command_ids.h" |
| 28 #include "chrome/browser/autofill/autofill_manager.h" | 28 #include "chrome/browser/autofill/autofill_manager.h" |
| 29 #if defined(OS_WIN) | 29 #if defined(OS_WIN) |
| 30 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" | 30 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" |
| 31 #endif // defined(OS_WIN) | 31 #endif // defined(OS_WIN) |
| 32 #include "chrome/browser/bookmarks/bookmark_model.h" | 32 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 33 #include "chrome/browser/bookmarks/bookmark_utils.h" | 33 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 34 #include "chrome/browser/browser_list.h" | 34 #include "chrome/browser/browser_list.h" |
| 35 #include "chrome/browser/browser_navigator.h" | |
| 36 #include "chrome/browser/browser_process.h" | 35 #include "chrome/browser/browser_process.h" |
| 37 #include "chrome/browser/browser_shutdown.h" | 36 #include "chrome/browser/browser_shutdown.h" |
| 38 #include "chrome/browser/browser_window.h" | 37 #include "chrome/browser/browser_window.h" |
| 39 #include "chrome/browser/browser_url_handler.h" | 38 #include "chrome/browser/browser_url_handler.h" |
| 40 #include "chrome/browser/character_encoding.h" | 39 #include "chrome/browser/character_encoding.h" |
| 41 #include "chrome/browser/debugger/devtools_manager.h" | 40 #include "chrome/browser/debugger/devtools_manager.h" |
| 42 #include "chrome/browser/debugger/devtools_toggle_action.h" | 41 #include "chrome/browser/debugger/devtools_toggle_action.h" |
| 43 #include "chrome/browser/debugger/devtools_window.h" | 42 #include "chrome/browser/debugger/devtools_window.h" |
| 44 #include "chrome/browser/dock_info.h" | 43 #include "chrome/browser/dock_info.h" |
| 45 #include "chrome/browser/dom_ui/filebrowse_ui.h" | 44 #include "chrome/browser/dom_ui/filebrowse_ui.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 #include "chrome/browser/sync/profile_sync_service.h" | 80 #include "chrome/browser/sync/profile_sync_service.h" |
| 82 #include "chrome/browser/sync/sync_ui_util.h" | 81 #include "chrome/browser/sync/sync_ui_util.h" |
| 83 #include "chrome/browser/tab_closeable_state_watcher.h" | 82 #include "chrome/browser/tab_closeable_state_watcher.h" |
| 84 #include "chrome/browser/tab_contents/interstitial_page.h" | 83 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 85 #include "chrome/browser/tab_contents/navigation_controller.h" | 84 #include "chrome/browser/tab_contents/navigation_controller.h" |
| 86 #include "chrome/browser/tab_contents/navigation_entry.h" | 85 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 87 #include "chrome/browser/tab_contents/tab_contents.h" | 86 #include "chrome/browser/tab_contents/tab_contents.h" |
| 88 #include "chrome/browser/tab_contents/tab_contents_view.h" | 87 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 89 #include "chrome/browser/tab_menu_model.h" | 88 #include "chrome/browser/tab_menu_model.h" |
| 90 #include "chrome/browser/tabs/tab_strip_model.h" | 89 #include "chrome/browser/tabs/tab_strip_model.h" |
| 90 #include "chrome/browser/ui/browser_navigator.h" |
| 91 #include "chrome/browser/upgrade_detector.h" | 91 #include "chrome/browser/upgrade_detector.h" |
| 92 #include "chrome/browser/web_applications/web_app.h" | 92 #include "chrome/browser/web_applications/web_app.h" |
| 93 #include "chrome/browser/window_sizer.h" | 93 #include "chrome/browser/window_sizer.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/notification_service.h" | 98 #include "chrome/common/notification_service.h" |
| 99 #include "chrome/common/page_transition_types.h" | 99 #include "chrome/common/page_transition_types.h" |
| 100 #include "chrome/common/pref_names.h" | 100 #include "chrome/common/pref_names.h" |
| (...skipping 3993 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4094 NOTREACHED(); | 4094 NOTREACHED(); |
| 4095 return false; | 4095 return false; |
| 4096 } | 4096 } |
| 4097 | 4097 |
| 4098 void Browser::CreateInstantIfNecessary() { | 4098 void Browser::CreateInstantIfNecessary() { |
| 4099 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4099 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
| 4100 !profile()->IsOffTheRecord()) { | 4100 !profile()->IsOffTheRecord()) { |
| 4101 instant_.reset(new InstantController(profile_, this)); | 4101 instant_.reset(new InstantController(profile_, this)); |
| 4102 } | 4102 } |
| 4103 } | 4103 } |
| OLD | NEW |