| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/gtk/browser_toolbar_gtk.h" | 5 #include "chrome/browser/gtk/browser_toolbar_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <X11/XF86keysym.h> | 8 #include <X11/XF86keysym.h> |
| 9 | 9 |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "grit/chromium_strings.h" | 38 #include "grit/chromium_strings.h" |
| 39 #include "grit/generated_resources.h" | 39 #include "grit/generated_resources.h" |
| 40 #include "grit/theme_resources.h" | 40 #include "grit/theme_resources.h" |
| 41 | 41 |
| 42 namespace { | 42 namespace { |
| 43 | 43 |
| 44 // Height of the toolbar in pixels. | 44 // Height of the toolbar in pixels. |
| 45 const int kToolbarHeight = 37; | 45 const int kToolbarHeight = 37; |
| 46 | 46 |
| 47 // Interior spacing between toolbar widgets. | 47 // Interior spacing between toolbar widgets. |
| 48 const int kToolbarWidgetSpacing = 6; | 48 const int kToolbarWidgetSpacing = 4; |
| 49 | 49 |
| 50 // The amount of space between the bottom of the star and the top of the | 50 // The amount of space between the bottom of the star and the top of the |
| 51 // Omnibox results popup window. We want a two pixel space between the bottom | 51 // Omnibox results popup window. We want a two pixel space between the bottom |
| 52 // and the results, but have some extra space below the buttons already. | 52 // and the results, but have some extra space below the buttons already. |
| 53 const int kPopupTopMargin = 0; | 53 const int kPopupTopMargin = 0; |
| 54 | 54 |
| 55 // Space between the edge of the star/go button and the popup frame. We want | 55 // Space between the edge of the star/go button and the popup frame. We want |
| 56 // to leave 1 pixel on both side here so that the borders line up. | 56 // to leave 1 pixel on both side here so that the borders line up. |
| 57 const int kPopupLeftRightMargin = 1; | 57 const int kPopupLeftRightMargin = 1; |
| 58 | 58 |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 break; | 526 break; |
| 527 } | 527 } |
| 528 } | 528 } |
| 529 | 529 |
| 530 void BrowserToolbarGtk::InitNineBox() { | 530 void BrowserToolbarGtk::InitNineBox() { |
| 531 // TODO(estade): use |profile_|? | 531 // TODO(estade): use |profile_|? |
| 532 background_ninebox_.reset(new NineBox( | 532 background_ninebox_.reset(new NineBox( |
| 533 browser_->profile()->GetThemeProvider(), | 533 browser_->profile()->GetThemeProvider(), |
| 534 0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0)); | 534 0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0)); |
| 535 } | 535 } |
| OLD | NEW |