OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/shelf_item_dialog.h" | 5 #include "chrome/browser/views/shelf_item_dialog.h" |
6 | 6 |
7 #include "base/gfx/png_decoder.h" | 7 #include "base/gfx/png_decoder.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "chrome/app/locales/locale_settings.h" | 9 #include "chrome/app/locales/locale_settings.h" |
10 #include "chrome/app/theme/theme_resources.h" | 10 #include "chrome/app/theme/theme_resources.h" |
11 #include "chrome/browser/profile.h" | 11 #include "chrome/browser/profile.h" |
12 #include "chrome/browser/tab_contents.h" | 12 #include "chrome/browser/tab_contents.h" |
13 #include "chrome/browser/url_fixer_upper.h" | 13 #include "chrome/browser/url_fixer_upper.h" |
14 #include "chrome/browser/views/standard_layout.h" | 14 #include "chrome/browser/views/standard_layout.h" |
15 #include "chrome/common/gfx/url_elider.h" | 15 #include "chrome/common/gfx/url_elider.h" |
16 #include "chrome/common/l10n_util.h" | 16 #include "chrome/common/l10n_util.h" |
17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
18 #include "chrome/common/pref_service.h" | 18 #include "chrome/common/pref_service.h" |
19 #include "chrome/common/resource_bundle.h" | 19 #include "chrome/common/resource_bundle.h" |
20 #include "chrome/common/stl_util-inl.h" | 20 #include "chrome/common/stl_util-inl.h" |
21 #include "chrome/views/background.h" | 21 #include "chrome/views/background.h" |
22 #include "chrome/views/focus_manager.h" | 22 #include "chrome/views/focus_manager.h" |
23 #include "chrome/views/grid_layout.h" | 23 #include "chrome/views/grid_layout.h" |
24 #include "chrome/views/label.h" | 24 #include "chrome/views/label.h" |
25 #include "chrome/views/text_field.h" | 25 #include "chrome/views/text_field.h" |
26 #include "generated_resources.h" | 26 #include "generated_resources.h" |
27 #include "net/base/net_util.h" | 27 #include "net/base/net_util.h" |
28 | 28 |
| 29 using base::Time; |
| 30 using base::TimeDelta; |
29 using views::ColumnSet; | 31 using views::ColumnSet; |
30 using views::GridLayout; | 32 using views::GridLayout; |
31 | 33 |
32 // Preferred height of the table. | 34 // Preferred height of the table. |
33 static const int kTableWidth = 300; | 35 static const int kTableWidth = 300; |
34 | 36 |
35 // The default favicon. | 37 // The default favicon. |
36 static SkBitmap* default_fav_icon = NULL; | 38 static SkBitmap* default_fav_icon = NULL; |
37 | 39 |
38 //////////////////////////////////////////////////////////////////////////////// | 40 //////////////////////////////////////////////////////////////////////////////// |
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 PerformModelChange(); | 495 PerformModelChange(); |
494 if (window()) | 496 if (window()) |
495 window()->Close(); | 497 window()->Close(); |
496 } | 498 } |
497 } | 499 } |
498 | 500 |
499 GURL ShelfItemDialog::GetInputURL() const { | 501 GURL ShelfItemDialog::GetInputURL() const { |
500 return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L"")); | 502 return GURL(URLFixerUpper::FixupURL(url_field_->GetText(), L"")); |
501 } | 503 } |
502 | 504 |
OLD | NEW |