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

Side by Side Diff: chrome/browser/ui/gtk/content_setting_bubble_gtk.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/ui/gtk/content_setting_bubble_gtk.h" 5 #include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/i18n/rtl.h" 11 #include "base/i18n/rtl.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/blocked_content_container.h" 13 #include "chrome/browser/blocked_content_container.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/content_setting_bubble_model.h" 15 #include "chrome/browser/content_setting_bubble_model.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/tab_contents/tab_contents.h" 17 #include "chrome/browser/tab_contents/tab_contents.h"
18 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" 18 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
19 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 19 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
20 #include "chrome/browser/ui/gtk/gtk_util.h" 20 #include "chrome/browser/ui/gtk/gtk_util.h"
21 #include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h" 21 #include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h"
22 #include "chrome/common/content_settings.h" 22 #include "chrome/common/content_settings.h"
23 #include "chrome/common/notification_source.h" 23 #include "chrome/common/notification_source.h"
24 #include "chrome/common/notification_type.h" 24 #include "chrome/common/notification_type.h"
25 #include "gfx/gtk_util.h"
26 #include "grit/app_resources.h" 25 #include "grit/app_resources.h"
27 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
28 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/base/text/text_elider.h" 28 #include "ui/base/text/text_elider.h"
29 #include "ui/gfx/gtk_util.h"
30 #include "webkit/plugins/npapi/plugin_list.h" 30 #include "webkit/plugins/npapi/plugin_list.h"
31 31
32 namespace { 32 namespace {
33 33
34 // Padding between content and edge of info bubble. 34 // Padding between content and edge of info bubble.
35 const int kContentBorder = 7; 35 const int kContentBorder = 7;
36 36
37 // The maximum width of a title entry in the content box. We elide anything 37 // The maximum width of a title entry in the content box. We elide anything
38 // longer than this. 38 // longer than this.
39 const int kMaxLinkPixelSize = 500; 39 const int kMaxLinkPixelSize = 500;
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 307
308 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) { 308 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {
309 content_setting_bubble_model_->OnCustomLinkClicked(); 309 content_setting_bubble_model_->OnCustomLinkClicked();
310 Close(); 310 Close();
311 } 311 }
312 312
313 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) { 313 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {
314 content_setting_bubble_model_->OnManageLinkClicked(); 314 content_setting_bubble_model_->OnManageLinkClicked();
315 Close(); 315 Close();
316 } 316 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698