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

Side by Side Diff: chrome/browser/ui/gtk/infobars/infobar_gtk.cc

Issue 7740003: content: Move gtk_expanded_container to ui/base/gtk/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and retry failing windows compile Created 9 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
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/infobars/infobar_gtk.h" 5 #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 8 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
9 #include "chrome/browser/ui/gtk/custom_button.h" 9 #include "chrome/browser/ui/gtk/custom_button.h"
10 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" 10 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
11 #include "chrome/browser/ui/gtk/gtk_expanded_container.h"
12 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 11 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
13 #include "chrome/browser/ui/gtk/gtk_util.h" 12 #include "chrome/browser/ui/gtk/gtk_util.h"
14 #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h" 13 #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h"
15 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
16 #include "chrome/common/chrome_notification_types.h" 15 #include "chrome/common/chrome_notification_types.h"
17 #include "content/common/notification_service.h" 16 #include "content/common/notification_service.h"
17 #include "ui/base/gtk/gtk_expanded_container.h"
18 #include "ui/gfx/gtk_util.h" 18 #include "ui/gfx/gtk_util.h"
19 #include "ui/gfx/image/image.h" 19 #include "ui/gfx/image/image.h"
20 20
21 namespace { 21 namespace {
22 22
23 // Pixels between infobar elements. 23 // Pixels between infobar elements.
24 const int kElementPadding = 5; 24 const int kElementPadding = 5;
25 25
26 // Extra padding on either end of info bar. 26 // Extra padding on either end of info bar.
27 const int kLeftPadding = 5; 27 const int kLeftPadding = 5;
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 const NotificationSource& source, 259 const NotificationSource& source,
260 const NotificationDetails& details) { 260 const NotificationDetails& details) {
261 UpdateBorderColor(); 261 UpdateBorderColor();
262 } 262 }
263 263
264 void InfoBarGtk::OnChildSizeRequest(GtkWidget* expanded, 264 void InfoBarGtk::OnChildSizeRequest(GtkWidget* expanded,
265 GtkWidget* child, 265 GtkWidget* child,
266 GtkRequisition* requisition) { 266 GtkRequisition* requisition) {
267 requisition->height = -1; 267 requisition->height = -1;
268 } 268 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/gtk_expanded_container_unittest.cc ('k') | chrome/browser/ui/gtk/slide_animator_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698