OLD | NEW |
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/views/url_picker.h" | 5 #include "chrome/browser/ui/views/url_picker.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | |
9 #include "base/stl_util-inl.h" | 8 #include "base/stl_util-inl.h" |
10 #include "base/string16.h" | 9 #include "base/string16.h" |
11 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/net/url_fixer_upper.h" | 11 #include "chrome/browser/net/url_fixer_upper.h" |
13 #include "chrome/browser/possible_url_model.h" | 12 #include "chrome/browser/possible_url_model.h" |
14 #include "chrome/browser/prefs/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
15 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
17 #include "grit/app_resources.h" | 16 #include "grit/app_resources.h" |
18 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
19 #include "grit/locale_settings.h" | 18 #include "grit/locale_settings.h" |
20 #include "net/base/net_util.h" | 19 #include "net/base/net_util.h" |
21 #include "ui/base/keycodes/keyboard_codes.h" | 20 #include "ui/base/keycodes/keyboard_codes.h" |
22 #include "ui/base/models/table_model.h" | 21 #include "ui/base/models/table_model.h" |
| 22 #include "ui/base/resource/resource_bundle.h" |
23 #include "views/background.h" | 23 #include "views/background.h" |
24 #include "views/controls/label.h" | 24 #include "views/controls/label.h" |
25 #include "views/controls/table/table_view.h" | 25 #include "views/controls/table/table_view.h" |
26 #include "views/controls/textfield/textfield.h" | 26 #include "views/controls/textfield/textfield.h" |
27 #include "views/focus/focus_manager.h" | 27 #include "views/focus/focus_manager.h" |
28 #include "views/grid_layout.h" | 28 #include "views/grid_layout.h" |
29 #include "views/standard_layout.h" | 29 #include "views/standard_layout.h" |
30 #include "views/widget/widget.h" | 30 #include "views/widget/widget.h" |
31 | 31 |
32 using views::ColumnSet; | 32 using views::ColumnSet; |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 PerformModelChange(); | 238 PerformModelChange(); |
239 if (window()) | 239 if (window()) |
240 window()->Close(); | 240 window()->Close(); |
241 } | 241 } |
242 } | 242 } |
243 | 243 |
244 GURL UrlPicker::GetInputURL() const { | 244 GURL UrlPicker::GetInputURL() const { |
245 return URLFixerUpper::FixupURL(UTF16ToUTF8(url_field_->text()), | 245 return URLFixerUpper::FixupURL(UTF16ToUTF8(url_field_->text()), |
246 std::string()); | 246 std::string()); |
247 } | 247 } |
OLD | NEW |