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

Side by Side Diff: chrome/browser/plugin_observer.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/plugin_observer.h" 5 #include "chrome/browser/plugin_observer.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/google/google_util.h" 9 #include "chrome/browser/google/google_util.h"
10 #include "chrome/browser/plugin_installer_infobar_delegate.h" 10 #include "chrome/browser/plugin_installer_infobar_delegate.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" 12 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
13 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" 13 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
14 #include "chrome/common/render_messages.h" 14 #include "chrome/common/render_messages.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "content/browser/renderer_host/render_view_host.h" 16 #include "content/browser/renderer_host/render_view_host.h"
17 #include "content/browser/tab_contents/tab_contents.h" 17 #include "content/browser/tab_contents/tab_contents.h"
18 #include "content/browser/user_metrics.h" 18 #include "content/browser/user_metrics.h"
19 #include "content/common/view_messages.h" 19 #include "content/common/view_messages.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "grit/theme_resources.h" 21 #include "grit/theme_resources_standard.h"
22 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "webkit/plugins/npapi/default_plugin_shared.h" 24 #include "webkit/plugins/npapi/default_plugin_shared.h"
25 #include "webkit/plugins/npapi/plugin_group.h" 25 #include "webkit/plugins/npapi/plugin_group.h"
26 #include "webkit/plugins/npapi/plugin_list.h" 26 #include "webkit/plugins/npapi/plugin_list.h"
27 #include "webkit/plugins/npapi/webplugininfo.h" 27 #include "webkit/plugins/npapi/webplugininfo.h"
28 28
29 namespace { 29 namespace {
30 30
31 // PluginInfoBarDelegate ------------------------------------------------------ 31 // PluginInfoBarDelegate ------------------------------------------------------
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 true)); 360 true));
361 } 361 }
362 362
363 void PluginObserver::OnBlockedOutdatedPlugin(const string16& name, 363 void PluginObserver::OnBlockedOutdatedPlugin(const string16& name,
364 const GURL& update_url) { 364 const GURL& update_url) {
365 tab_contents()->AddInfoBar(update_url.is_empty() ? 365 tab_contents()->AddInfoBar(update_url.is_empty() ?
366 static_cast<InfoBarDelegate*>(new BlockedPluginInfoBarDelegate( 366 static_cast<InfoBarDelegate*>(new BlockedPluginInfoBarDelegate(
367 tab_contents(), name)) : 367 tab_contents(), name)) :
368 new OutdatedPluginInfoBarDelegate(tab_contents(), name, update_url)); 368 new OutdatedPluginInfoBarDelegate(tab_contents(), name, update_url));
369 } 369 }
370
OLDNEW
« no previous file with comments | « chrome/browser/plugin_installer_infobar_delegate.cc ('k') | chrome/browser/tab_contents/tab_contents_ssl_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698