| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 141 |
| 142 using base::TimeDelta; | 142 using base::TimeDelta; |
| 143 | 143 |
| 144 /////////////////////////////////////////////////////////////////////////////// | 144 /////////////////////////////////////////////////////////////////////////////// |
| 145 | 145 |
| 146 namespace { | 146 namespace { |
| 147 | 147 |
| 148 // The URL to be loaded to display Help. | 148 // The URL to be loaded to display Help. |
| 149 #if defined(OS_CHROMEOS) | 149 #if defined(OS_CHROMEOS) |
| 150 const char kHelpContentUrl[] = | 150 const char kHelpContentUrl[] = |
| 151 "chrome-extension://oonnajkebngbfpmcpekfdeofeannbapp/main.html"; | 151 "chrome-extension://hldlkofeohkcjdbkbjfhmbmkcdbijmnp/main.html"; |
| 152 const char kHelpContentOnlineUrl[] = | 152 const char kHelpContentOnlineUrl[] = |
| 153 "http://www.google.com/support/chromeos/"; | 153 "http://www.google.com/support/chromeos/"; |
| 154 #else | 154 #else |
| 155 const char kHelpContentUrl[] = | 155 const char kHelpContentUrl[] = |
| 156 "http://www.google.com/support/chrome/"; | 156 "http://www.google.com/support/chrome/"; |
| 157 #endif | 157 #endif |
| 158 | 158 |
| 159 // The URL to be opened when the Help link on the Autofill dialog is clicked. | 159 // The URL to be opened when the Help link on the Autofill dialog is clicked. |
| 160 const char kAutofillHelpUrl[] = | 160 const char kAutofillHelpUrl[] = |
| 161 #if defined(OS_CHROMEOS) | 161 #if defined(OS_CHROMEOS) |
| (...skipping 3998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4160 return false; | 4160 return false; |
| 4161 } | 4161 } |
| 4162 | 4162 |
| 4163 void Browser::CreateInstantIfNecessary() { | 4163 void Browser::CreateInstantIfNecessary() { |
| 4164 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4164 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
| 4165 !profile()->IsOffTheRecord()) { | 4165 !profile()->IsOffTheRecord()) { |
| 4166 instant_.reset(new InstantController(profile_, this)); | 4166 instant_.reset(new InstantController(profile_, this)); |
| 4167 instant_unload_handler_.reset(new InstantUnloadHandler(this)); | 4167 instant_unload_handler_.reset(new InstantUnloadHandler(this)); |
| 4168 } | 4168 } |
| 4169 } | 4169 } |
| OLD | NEW |