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/views/edit_keyword_controller.h" | 5 #include "chrome/browser/views/edit_keyword_controller.h" |
6 | 6 |
| 7 #include "app/l10n_util.h" |
7 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
8 #include "base/string_util.h" | 9 #include "base/string_util.h" |
9 #include "chrome/browser/metrics/user_metrics.h" | 10 #include "chrome/browser/metrics/user_metrics.h" |
10 #include "chrome/browser/net/url_fixer_upper.h" | 11 #include "chrome/browser/net/url_fixer_upper.h" |
11 #include "chrome/browser/profile.h" | 12 #include "chrome/browser/profile.h" |
12 #include "chrome/browser/search_engines/template_url.h" | 13 #include "chrome/browser/search_engines/template_url.h" |
13 #include "chrome/browser/search_engines/template_url_model.h" | 14 #include "chrome/browser/search_engines/template_url_model.h" |
14 #include "chrome/browser/views/keyword_editor_view.h" | 15 #include "chrome/browser/views/keyword_editor_view.h" |
15 #include "chrome/browser/views/standard_layout.h" | 16 #include "chrome/browser/views/standard_layout.h" |
16 #include "chrome/common/l10n_util.h" | |
17 #include "chrome/views/controls/label.h" | 17 #include "chrome/views/controls/label.h" |
18 #include "chrome/views/controls/image_view.h" | 18 #include "chrome/views/controls/image_view.h" |
19 #include "chrome/views/controls/table/table_view.h" | 19 #include "chrome/views/controls/table/table_view.h" |
20 #include "chrome/views/grid_layout.h" | 20 #include "chrome/views/grid_layout.h" |
21 #include "chrome/views/window/window.h" | 21 #include "chrome/views/window/window.h" |
22 #include "googleurl/src/gurl.h" | 22 #include "googleurl/src/gurl.h" |
23 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
24 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
25 | 25 |
26 using views::GridLayout; | 26 using views::GridLayout; |
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 } | 357 } |
358 | 358 |
359 void EditKeywordController::CleanUpCancelledAdd() { | 359 void EditKeywordController::CleanUpCancelledAdd() { |
360 if (!keyword_editor_view_ && template_url_) { | 360 if (!keyword_editor_view_ && template_url_) { |
361 // When we have no KeywordEditorView, we know that the template_url_ | 361 // When we have no KeywordEditorView, we know that the template_url_ |
362 // hasn't yet been added to the model, so we need to clean it up. | 362 // hasn't yet been added to the model, so we need to clean it up. |
363 delete template_url_; | 363 delete template_url_; |
364 template_url_ = NULL; | 364 template_url_ = NULL; |
365 } | 365 } |
366 } | 366 } |
OLD | NEW |