| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/url_picker.h" | 5 #include "chrome/browser/views/url_picker.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "app/table_model.h" | 9 #include "app/table_model.h" |
| 10 #include "app/table_model_observer.h" | 10 #include "app/table_model_observer.h" |
| 11 #include "base/keyboard_codes.h" | 11 #include "base/keyboard_codes.h" |
| 12 #include "base/stl_util-inl.h" | 12 #include "base/stl_util-inl.h" |
| 13 #include "base/string_util.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/browser/net/url_fixer_upper.h" | 14 #include "chrome/browser/net/url_fixer_upper.h" |
| 15 #include "chrome/browser/possible_url_model.h" | 15 #include "chrome/browser/possible_url_model.h" |
| 16 #include "chrome/browser/pref_service.h" | 16 #include "chrome/browser/pref_service.h" |
| 17 #include "chrome/browser/profile.h" | 17 #include "chrome/browser/profile.h" |
| 18 #include "chrome/browser/tab_contents/tab_contents.h" | 18 #include "chrome/browser/tab_contents/tab_contents.h" |
| 19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
| 20 #include "grit/app_resources.h" | 20 #include "grit/app_resources.h" |
| 21 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
| 22 #include "grit/locale_settings.h" | 22 #include "grit/locale_settings.h" |
| 23 #include "net/base/net_util.h" | 23 #include "net/base/net_util.h" |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 PerformModelChange(); | 237 PerformModelChange(); |
| 238 if (window()) | 238 if (window()) |
| 239 window()->Close(); | 239 window()->Close(); |
| 240 } | 240 } |
| 241 } | 241 } |
| 242 | 242 |
| 243 GURL UrlPicker::GetInputURL() const { | 243 GURL UrlPicker::GetInputURL() const { |
| 244 return GURL(URLFixerUpper::FixupURL(UTF16ToUTF8(url_field_->text()), | 244 return GURL(URLFixerUpper::FixupURL(UTF16ToUTF8(url_field_->text()), |
| 245 std::string())); | 245 std::string())); |
| 246 } | 246 } |
| OLD | NEW |