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

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Retrying upload after AppEngine error Created 9 years, 11 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) 2010 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/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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
(...skipping 19 matching lines...) Expand all
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "grit/chromium_strings.h" 32 #include "grit/chromium_strings.h"
33 #include "grit/generated_resources.h" 33 #include "grit/generated_resources.h"
34 #include "grit/theme_resources.h" 34 #include "grit/theme_resources.h"
35 35
36 #if defined(OS_MACOSX) 36 #if defined(OS_MACOSX)
37 #include "chrome/browser/ui/cocoa/extension_installed_bubble_bridge.h" 37 #include "chrome/browser/ui/cocoa/extension_installed_bubble_bridge.h"
38 #endif 38 #endif
39 39
40 #if defined(TOOLKIT_VIEWS) 40 #if defined(TOOLKIT_VIEWS)
41 #include "chrome/browser/views/extensions/extension_installed_bubble.h" 41 #include "chrome/browser/ui/views/extensions/extension_installed_bubble.h"
42 #endif 42 #endif
43 43
44 #if defined(TOOLKIT_GTK) 44 #if defined(TOOLKIT_GTK)
45 #include "chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h" 45 #include "chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h"
46 #include "chrome/browser/gtk/extension_installed_bubble_gtk.h" 46 #include "chrome/browser/gtk/extension_installed_bubble_gtk.h"
47 #include "chrome/browser/gtk/gtk_theme_provider.h" 47 #include "chrome/browser/gtk/gtk_theme_provider.h"
48 #endif 48 #endif
49 49
50 // static 50 // static
51 const int ExtensionInstallUI::kTitleIds[NUM_PROMPT_TYPES] = { 51 const int ExtensionInstallUI::kTitleIds[NUM_PROMPT_TYPES] = {
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 TabContents* tab_contents, const Extension* new_theme, 313 TabContents* tab_contents, const Extension* new_theme,
314 const std::string& previous_theme_id, bool previous_use_system_theme) { 314 const std::string& previous_theme_id, bool previous_use_system_theme) {
315 #if defined(TOOLKIT_GTK) 315 #if defined(TOOLKIT_GTK)
316 return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme, 316 return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme,
317 previous_theme_id, previous_use_system_theme); 317 previous_theme_id, previous_use_system_theme);
318 #else 318 #else
319 return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme, 319 return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
320 previous_theme_id); 320 previous_theme_id);
321 #endif 321 #endif
322 } 322 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698