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/location_bar_view_gtk.h" | 5 #include "chrome/browser/gtk/location_bar_view_gtk.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/gfx/gtk_util.h" | 11 #include "base/gfx/gtk_util.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
14 #include "chrome/app/chrome_dll_resource.h" | 14 #include "chrome/app/chrome_dll_resource.h" |
15 #include "chrome/browser/alternate_nav_url_fetcher.h" | 15 #include "chrome/browser/alternate_nav_url_fetcher.h" |
16 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" | 16 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" |
17 #include "chrome/browser/command_updater.h" | 17 #include "chrome/browser/command_updater.h" |
18 #include "chrome/browser/tab_contents/tab_contents.h" | 18 #include "chrome/browser/tab_contents/tab_contents.h" |
19 #include "chrome/common/gtk_util.h" | 19 #include "chrome/common/gtk_util.h" |
20 #include "chrome/common/page_transition_types.h" | 20 #include "chrome/common/page_transition_types.h" |
21 #include "skia/include/SkBitmap.h" | 21 #include "third_party/skia/include/core/SkBitmap.h" |
22 #include "webkit/glue/window_open_disposition.h" | 22 #include "webkit/glue/window_open_disposition.h" |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 // We are positioned with a little bit of extra space that we don't use now. | 26 // We are positioned with a little bit of extra space that we don't use now. |
27 const int kTopMargin = 1; | 27 const int kTopMargin = 1; |
28 const int kBottomMargin = 1; | 28 const int kBottomMargin = 1; |
29 // We don't want to edit control's text to be right against the edge. | 29 // We don't want to edit control's text to be right against the edge. |
30 const int kEditLeftRightPadding = 4; | 30 const int kEditLeftRightPadding = 4; |
31 // We draw a border on the top and bottom (but not on left or right). | 31 // We draw a border on the top and bottom (but not on left or right). |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 break; | 285 break; |
286 default: | 286 default: |
287 NOTREACHED(); | 287 NOTREACHED(); |
288 security_icon_ = NULL; | 288 security_icon_ = NULL; |
289 break; | 289 break; |
290 } | 290 } |
291 | 291 |
292 // Make sure there is room for the icon. | 292 // Make sure there is room for the icon. |
293 UpdateAlignmentPadding(); | 293 UpdateAlignmentPadding(); |
294 } | 294 } |
OLD | NEW |