| OLD | NEW |
| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 #include "chrome/browser/chromeos/boot_times_loader.h" | 132 #include "chrome/browser/chromeos/boot_times_loader.h" |
| 133 #endif | 133 #endif |
| 134 | 134 |
| 135 using base::TimeDelta; | 135 using base::TimeDelta; |
| 136 | 136 |
| 137 /////////////////////////////////////////////////////////////////////////////// | 137 /////////////////////////////////////////////////////////////////////////////// |
| 138 | 138 |
| 139 namespace { | 139 namespace { |
| 140 | 140 |
| 141 // The URL to be loaded to display Help. | 141 // The URL to be loaded to display Help. |
| 142 const char kHelpContentUrl[] = |
| 142 #if defined(OS_CHROMEOS) | 143 #if defined(OS_CHROMEOS) |
| 143 const char kHelpContentUrl[] = | 144 #if defined(OFFICIAL_BUILD) |
| 144 "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"; | 145 "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"; |
| 146 #else |
| 147 "http://www.google.com/support/chromeos/"; |
| 148 #endif |
| 145 #else | 149 #else |
| 146 const char kHelpContentUrl[] = | |
| 147 "http://www.google.com/support/chrome/"; | 150 "http://www.google.com/support/chrome/"; |
| 148 #endif | 151 #endif |
| 149 | 152 |
| 150 // The URL to be opened when the Help link on the Autofill dialog is clicked. | 153 // The URL to be opened when the Help link on the Autofill dialog is clicked. |
| 151 const char kAutofillHelpUrl[] = | 154 const char kAutofillHelpUrl[] = |
| 152 #if defined(OS_CHROMEOS) | 155 #if defined(OS_CHROMEOS) |
| 153 "http://www.google.com/support/chromeos/bin/answer.py?answer=142893"; | 156 "http://www.google.com/support/chromeos/bin/answer.py?answer=142893"; |
| 154 #else | 157 #else |
| 155 "http://www.google.com/support/chrome/bin/answer.py?answer=142893"; | 158 "http://www.google.com/support/chrome/bin/answer.py?answer=142893"; |
| 156 #endif | 159 #endif |
| (...skipping 4104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4261 // The page transition below is only for the purpose of inserting the tab. | 4264 // The page transition below is only for the purpose of inserting the tab. |
| 4262 browser->AddTab(view_source_contents, PageTransition::LINK); | 4265 browser->AddTab(view_source_contents, PageTransition::LINK); |
| 4263 } | 4266 } |
| 4264 | 4267 |
| 4265 if (profile_->HasSessionService()) { | 4268 if (profile_->HasSessionService()) { |
| 4266 SessionService* session_service = profile_->GetSessionService(); | 4269 SessionService* session_service = profile_->GetSessionService(); |
| 4267 if (session_service) | 4270 if (session_service) |
| 4268 session_service->TabRestored(&view_source_contents->controller(), false); | 4271 session_service->TabRestored(&view_source_contents->controller(), false); |
| 4269 } | 4272 } |
| 4270 } | 4273 } |
| OLD | NEW |