Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: chrome/browser/extensions/extension_install_ui.cc

Issue 10378009: Get rid of Image::Image(SkBitmap*) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 void ExtensionInstallUI::ShowConfirmation() { 514 void ExtensionInstallUI::ShowConfirmation() {
515 prompt_.set_type(prompt_type_); 515 prompt_.set_type(prompt_type_);
516 prompt_.SetPermissions(permissions_->GetWarningMessages()); 516 prompt_.SetPermissions(permissions_->GetWarningMessages());
517 517
518 switch (prompt_type_) { 518 switch (prompt_type_) {
519 case PERMISSIONS_PROMPT: 519 case PERMISSIONS_PROMPT:
520 case RE_ENABLE_PROMPT: 520 case RE_ENABLE_PROMPT:
521 case INLINE_INSTALL_PROMPT: 521 case INLINE_INSTALL_PROMPT:
522 case INSTALL_PROMPT: { 522 case INSTALL_PROMPT: {
523 prompt_.set_extension(extension_); 523 prompt_.set_extension(extension_);
524 prompt_.set_icon(gfx::Image(new SkBitmap(icon_))); 524 prompt_.set_icon(gfx::Image(icon_));
525 ShowExtensionInstallDialog(profile_, delegate_, prompt_); 525 ShowExtensionInstallDialog(profile_, delegate_, prompt_);
526 break; 526 break;
527 } 527 }
528 case BUNDLE_INSTALL_PROMPT: { 528 case BUNDLE_INSTALL_PROMPT: {
529 prompt_.set_bundle(bundle_); 529 prompt_.set_bundle(bundle_);
530 ShowExtensionInstallDialog(profile_, delegate_, prompt_); 530 ShowExtensionInstallDialog(profile_, delegate_, prompt_);
531 break; 531 break;
532 } 532 }
533 default: 533 default:
534 NOTREACHED() << "Unknown message"; 534 NOTREACHED() << "Unknown message";
535 break; 535 break;
536 } 536 }
537 } 537 }
538 538
539 InfoBarDelegate* ExtensionInstallUI::GetNewThemeInstalledInfoBarDelegate( 539 InfoBarDelegate* ExtensionInstallUI::GetNewThemeInstalledInfoBarDelegate(
540 TabContentsWrapper* tab_contents, 540 TabContentsWrapper* tab_contents,
541 const Extension* new_theme, 541 const Extension* new_theme,
542 const std::string& previous_theme_id, 542 const std::string& previous_theme_id,
543 bool previous_using_native_theme) { 543 bool previous_using_native_theme) {
544 Profile* profile = tab_contents->profile(); 544 Profile* profile = tab_contents->profile();
545 return new ThemeInstalledInfoBarDelegate( 545 return new ThemeInstalledInfoBarDelegate(
546 tab_contents->infobar_tab_helper(), 546 tab_contents->infobar_tab_helper(),
547 profile->GetExtensionService(), 547 profile->GetExtensionService(),
548 ThemeServiceFactory::GetForProfile(profile), 548 ThemeServiceFactory::GetForProfile(profile),
549 new_theme, 549 new_theme,
550 previous_theme_id, 550 previous_theme_id,
551 previous_using_native_theme); 551 previous_using_native_theme);
552 } 552 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/favicon/favicon_tab_helper.cc » ('j') | chrome/browser/icon_loader_chromeos.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698