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

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

Issue 6901058: Increase infobar height and infobar button height for touch. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Undo inadvertant merge changes (hopefully). Created 9 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) 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/extensions/theme_installed_infobar_delegate.h" 5 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/themes/theme_service.h" 12 #include "chrome/browser/themes/theme_service.h"
13 #include "chrome/browser/themes/theme_service_factory.h" 13 #include "chrome/browser/themes/theme_service_factory.h"
14 #include "chrome/common/extensions/extension.h" 14 #include "chrome/common/extensions/extension.h"
15 #include "content/browser/tab_contents/tab_contents.h" 15 #include "content/browser/tab_contents/tab_contents.h"
16 #include "content/common/notification_service.h" 16 #include "content/common/notification_service.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources_standard.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 21
22 ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate( 22 ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate(
23 TabContents* tab_contents, 23 TabContents* tab_contents,
24 const Extension* new_theme, 24 const Extension* new_theme,
25 const std::string& previous_theme_id, 25 const std::string& previous_theme_id,
26 bool previous_using_native_theme) 26 bool previous_using_native_theme)
27 : ConfirmInfoBarDelegate(tab_contents), 27 : ConfirmInfoBarDelegate(tab_contents),
28 profile_(tab_contents->profile()), 28 profile_(tab_contents->profile()),
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 tab_contents_ = NULL; 117 tab_contents_ = NULL;
118 // Although it's not being used anymore, this delegate is never deleted. 118 // Although it's not being used anymore, this delegate is never deleted.
119 // It can not be deleted now because it is still needed if we 119 // It can not be deleted now because it is still needed if we
120 // "undo" the theme change that triggered this notification 120 // "undo" the theme change that triggered this notification
121 // (when InfoBar::OnBackgroundExpose() is called). This will likely 121 // (when InfoBar::OnBackgroundExpose() is called). This will likely
122 // be fixed when infobar delegate deletion is cleaned up for 122 // be fixed when infobar delegate deletion is cleaned up for
123 // http://crbug.com/62154. 123 // http://crbug.com/62154.
124 } 124 }
125 } 125 }
126 } 126 }
OLDNEW
« no previous file with comments | « chrome/browser/download/download_request_infobar_delegate.cc ('k') | chrome/browser/first_run/try_chrome_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698