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/edit_keyword_controller.h" | 5 #include "chrome/browser/views/edit_keyword_controller.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "chrome/app/theme/theme_resources.h" | 8 #include "grit/theme_resources.h" |
9 #include "chrome/browser/metrics/user_metrics.h" | 9 #include "chrome/browser/metrics/user_metrics.h" |
10 #include "chrome/browser/net/url_fixer_upper.h" | 10 #include "chrome/browser/net/url_fixer_upper.h" |
11 #include "chrome/browser/profile.h" | 11 #include "chrome/browser/profile.h" |
12 #include "chrome/browser/search_engines/template_url.h" | 12 #include "chrome/browser/search_engines/template_url.h" |
13 #include "chrome/browser/search_engines/template_url_model.h" | 13 #include "chrome/browser/search_engines/template_url_model.h" |
14 #include "chrome/browser/views/keyword_editor_view.h" | 14 #include "chrome/browser/views/keyword_editor_view.h" |
15 #include "chrome/browser/views/standard_layout.h" | 15 #include "chrome/browser/views/standard_layout.h" |
16 #include "chrome/common/l10n_util.h" | 16 #include "chrome/common/l10n_util.h" |
17 #include "chrome/common/resource_bundle.h" | 17 #include "chrome/common/resource_bundle.h" |
18 #include "chrome/views/label.h" | 18 #include "chrome/views/label.h" |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 | 361 |
362 void EditKeywordController::CleanUpCancelledAdd() { | 362 void EditKeywordController::CleanUpCancelledAdd() { |
363 if (!keyword_editor_view_ && template_url_) { | 363 if (!keyword_editor_view_ && template_url_) { |
364 // When we have no KeywordEditorView, we know that the template_url_ | 364 // When we have no KeywordEditorView, we know that the template_url_ |
365 // hasn't yet been added to the model, so we need to clean it up. | 365 // hasn't yet been added to the model, so we need to clean it up. |
366 delete template_url_; | 366 delete template_url_; |
367 template_url_ = NULL; | 367 template_url_ = NULL; |
368 } | 368 } |
369 } | 369 } |
370 | 370 |
OLD | NEW |