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/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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 #include "webkit/glue/window_open_disposition.h" | 111 #include "webkit/glue/window_open_disposition.h" |
112 | 112 |
113 #if defined(ENABLE_REMOTING) | 113 #if defined(ENABLE_REMOTING) |
114 #include "chrome/browser/remoting/remoting_setup_flow.h" | 114 #include "chrome/browser/remoting/remoting_setup_flow.h" |
115 #endif | 115 #endif |
116 | 116 |
117 #if defined(OS_WIN) | 117 #if defined(OS_WIN) |
118 #include "app/win_util.h" | 118 #include "app/win_util.h" |
119 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" | 119 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" |
120 #include "chrome/browser/browser_child_process_host.h" | 120 #include "chrome/browser/browser_child_process_host.h" |
121 #include "chrome/browser/cert_store.h" | |
122 #include "chrome/browser/download/save_package.h" | 121 #include "chrome/browser/download/save_package.h" |
123 #include "chrome/browser/ssl/ssl_error_info.h" | 122 #include "chrome/browser/ssl/ssl_error_info.h" |
124 #include "chrome/browser/shell_integration.h" | 123 #include "chrome/browser/shell_integration.h" |
125 #include "chrome/browser/task_manager/task_manager.h" | 124 #include "chrome/browser/task_manager/task_manager.h" |
126 #include "chrome/browser/ui/view_ids.h" | 125 #include "chrome/browser/ui/view_ids.h" |
127 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 126 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
128 #endif // OS_WIN | 127 #endif // OS_WIN |
129 | 128 |
130 #if defined(OS_MACOSX) | 129 #if defined(OS_MACOSX) |
131 #include "chrome/browser/ui/cocoa/find_pasteboard.h" | 130 #include "chrome/browser/ui/cocoa/find_pasteboard.h" |
(...skipping 4028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4160 return false; | 4159 return false; |
4161 } | 4160 } |
4162 | 4161 |
4163 void Browser::CreateInstantIfNecessary() { | 4162 void Browser::CreateInstantIfNecessary() { |
4164 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4163 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
4165 !profile()->IsOffTheRecord()) { | 4164 !profile()->IsOffTheRecord()) { |
4166 instant_.reset(new InstantController(profile_, this)); | 4165 instant_.reset(new InstantController(profile_, this)); |
4167 instant_unload_handler_.reset(new InstantUnloadHandler(this)); | 4166 instant_unload_handler_.reset(new InstantUnloadHandler(this)); |
4168 } | 4167 } |
4169 } | 4168 } |
OLD | NEW |