| 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/extensions/extension_install_ui.h" | 5 #include "chrome/browser/extensions/extension_install_ui.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 #if defined(TOOLKIT_VIEWS) | 193 #if defined(TOOLKIT_VIEWS) |
| 194 AppLauncher::ShowForNewTab(browser, hash_params); | 194 AppLauncher::ShowForNewTab(browser, hash_params); |
| 195 #else | 195 #else |
| 196 NOTREACHED(); | 196 NOTREACHED(); |
| 197 #endif | 197 #endif |
| 198 } else { | 198 } else { |
| 199 std::string url(chrome::kChromeUINewTabURL); | 199 std::string url(chrome::kChromeUINewTabURL); |
| 200 url += "/#"; | 200 url += "/#"; |
| 201 url += hash_params; | 201 url += hash_params; |
| 202 browser->AddTabWithURL(GURL(url), GURL(), PageTransition::TYPED, -1, | 202 browser->AddTabWithURL(GURL(url), GURL(), PageTransition::TYPED, -1, |
| 203 TabStripModel::ADD_SELECTED, NULL, std::string()); | 203 TabStripModel::ADD_SELECTED, NULL, std::string(), |
| 204 NULL); |
| 204 } | 205 } |
| 205 | 206 |
| 206 return; | 207 return; |
| 207 } | 208 } |
| 208 | 209 |
| 209 #if defined(TOOLKIT_VIEWS) | 210 #if defined(TOOLKIT_VIEWS) |
| 210 if (!browser) | 211 if (!browser) |
| 211 return; | 212 return; |
| 212 | 213 |
| 213 ExtensionInstalledBubble::Show(extension, browser, icon_); | 214 ExtensionInstalledBubble::Show(extension, browser, icon_); |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 TabContents* tab_contents, Extension* new_theme, | 365 TabContents* tab_contents, Extension* new_theme, |
| 365 const std::string& previous_theme_id, bool previous_use_system_theme) { | 366 const std::string& previous_theme_id, bool previous_use_system_theme) { |
| 366 #if defined(TOOLKIT_GTK) | 367 #if defined(TOOLKIT_GTK) |
| 367 return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme, | 368 return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme, |
| 368 previous_theme_id, previous_use_system_theme); | 369 previous_theme_id, previous_use_system_theme); |
| 369 #else | 370 #else |
| 370 return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme, | 371 return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme, |
| 371 previous_theme_id); | 372 previous_theme_id); |
| 372 #endif | 373 #endif |
| 373 } | 374 } |
| OLD | NEW |