Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Side by Side Diff: chrome/browser/views/edit_keyword_controller.cc

Issue 113143: Move color_utils, text_elider, drag_utils, accessibility_types, standard_layo... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/views/download_item_view.cc ('k') | chrome/browser/views/first_run_bubble.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/browser/metrics/user_metrics.h" 10 #include "chrome/browser/metrics/user_metrics.h"
11 #include "chrome/browser/net/url_fixer_upper.h" 11 #include "chrome/browser/net/url_fixer_upper.h"
12 #include "chrome/browser/profile.h" 12 #include "chrome/browser/profile.h"
13 #include "chrome/browser/search_engines/template_url.h" 13 #include "chrome/browser/search_engines/template_url.h"
14 #include "chrome/browser/search_engines/template_url_model.h" 14 #include "chrome/browser/search_engines/template_url_model.h"
15 #include "chrome/browser/views/keyword_editor_view.h" 15 #include "chrome/browser/views/keyword_editor_view.h"
16 #include "chrome/browser/views/standard_layout.h"
17 #include "googleurl/src/gurl.h" 16 #include "googleurl/src/gurl.h"
18 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
19 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
20 #include "views/controls/label.h" 19 #include "views/controls/label.h"
21 #include "views/controls/image_view.h" 20 #include "views/controls/image_view.h"
22 #include "views/controls/table/table_view.h" 21 #include "views/controls/table/table_view.h"
23 #include "views/grid_layout.h" 22 #include "views/grid_layout.h"
23 #include "views/standard_layout.h"
24 #include "views/window/window.h" 24 #include "views/window/window.h"
25 25
26 using views::GridLayout; 26 using views::GridLayout;
27 using views::ImageView; 27 using views::ImageView;
28 using views::TextField; 28 using views::TextField;
29 29
30 30
31 namespace { 31 namespace {
32 // Converts a URL as understood by TemplateURL to one appropriate for display 32 // Converts a URL as understood by TemplateURL to one appropriate for display
33 // to the user. 33 // to the user.
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/views/download_item_view.cc ('k') | chrome/browser/views/first_run_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698