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

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

Issue 164369: Merge 22244 - Try again to land: http://codereview.chromium.org/160483... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/browser/extensions/extension_install_ui.cc:r22244
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "grit/chromium_strings.h" 8 #include "grit/chromium_strings.h"
9 #include "chrome/browser/browser_list.h" 9 #include "chrome/browser/browser_list.h"
10 #include "chrome/browser/extensions/theme_preview_infobar_delegate.h" 10 #include "chrome/browser/extensions/theme_preview_infobar_delegate.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 if (delegate->AsThemePreviewInfobarDelegate()) { 109 if (delegate->AsThemePreviewInfobarDelegate()) {
110 tab_contents->RemoveInfoBar(delegate); 110 tab_contents->RemoveInfoBar(delegate);
111 break; 111 break;
112 } 112 }
113 } 113 }
114 114
115 // Now add the new one. 115 // Now add the new one.
116 tab_contents->AddInfoBar(new ThemePreviewInfobarDelegate( 116 tab_contents->AddInfoBar(new ThemePreviewInfobarDelegate(
117 tab_contents, extension->name())); 117 tab_contents, extension->name()));
118 } 118 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_install_ui.h ('k') | chrome/browser/extensions/extensions_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698