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

Side by Side Diff: chrome/browser/ui/views/edit_search_engine_dialog.cc

Issue 8655001: views: Move table and tree directories to ui/views/controls/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: exclude native_widget_win_unittest too Created 9 years, 1 month 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
OLDNEW
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/edit_search_engine_dialog.h" 5 #include "chrome/browser/ui/views/edit_search_engine_dialog.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/search_engines/template_url.h" 10 #include "chrome/browser/search_engines/template_url.h"
11 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" 11 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
12 #include "googleurl/src/gurl.h" 12 #include "googleurl/src/gurl.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "grit/theme_resources.h" 14 #include "grit/theme_resources.h"
15 #include "grit/ui_resources.h" 15 #include "grit/ui_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/views/controls/table/table_view.h"
18 #include "ui/views/layout/grid_layout.h" 19 #include "ui/views/layout/grid_layout.h"
19 #include "ui/views/layout/layout_constants.h" 20 #include "ui/views/layout/layout_constants.h"
20 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
21 #include "views/controls/image_view.h" 22 #include "views/controls/image_view.h"
22 #include "views/controls/label.h" 23 #include "views/controls/label.h"
23 #include "views/controls/table/table_view.h"
24 #include "views/controls/textfield/textfield.h" 24 #include "views/controls/textfield/textfield.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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 image_view->SetImage( 257 image_view->SetImage(
258 ResourceBundle::GetSharedInstance().GetBitmapNamed( 258 ResourceBundle::GetSharedInstance().GetBitmapNamed(
259 IDR_INPUT_GOOD)); 259 IDR_INPUT_GOOD));
260 } else { 260 } else {
261 image_view->SetTooltipText(l10n_util::GetStringUTF16(invalid_message_id)); 261 image_view->SetTooltipText(l10n_util::GetStringUTF16(invalid_message_id));
262 image_view->SetImage( 262 image_view->SetImage(
263 ResourceBundle::GetSharedInstance().GetBitmapNamed( 263 ResourceBundle::GetSharedInstance().GetBitmapNamed(
264 IDR_INPUT_ALERT)); 264 IDR_INPUT_ALERT));
265 } 265 }
266 } 266 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/cookie_info_view.cc ('k') | chrome/browser/ui/views/hung_renderer_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698