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

Side by Side Diff: chrome/browser/views/options/exception_editor_view.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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
OLDNEW
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/options/exception_editor_view.h" 5 #include "chrome/browser/views/options/exception_editor_view.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/utf_string_conversions.h"
9 #include "chrome/browser/content_exceptions_table_model.h" 10 #include "chrome/browser/content_exceptions_table_model.h"
10 #include "chrome/browser/host_content_settings_map.h" 11 #include "chrome/browser/host_content_settings_map.h"
11 #include "googleurl/src/url_canon.h" 12 #include "googleurl/src/url_canon.h"
12 #include "googleurl/src/url_parse.h" 13 #include "googleurl/src/url_parse.h"
13 #include "grit/app_resources.h" 14 #include "grit/app_resources.h"
14 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
15 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
16 #include "views/grid_layout.h" 17 #include "views/grid_layout.h"
17 #include "views/controls/image_view.h" 18 #include "views/controls/image_view.h"
18 #include "views/controls/label.h" 19 #include "views/controls/label.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 return is_new() ? is_valid_host : (!host.empty() && 154 return is_new() ? is_valid_host : (!host.empty() &&
154 ((host_ == host) || is_valid_host)); 155 ((host_ == host) || is_valid_host));
155 } 156 }
156 157
157 void ExceptionEditorView::UpdateImageView(views::ImageView* image_view, 158 void ExceptionEditorView::UpdateImageView(views::ImageView* image_view,
158 bool is_valid) { 159 bool is_valid) {
159 return image_view->SetImage( 160 return image_view->SetImage(
160 ResourceBundle::GetSharedInstance().GetBitmapNamed( 161 ResourceBundle::GetSharedInstance().GetBitmapNamed(
161 is_valid ? IDR_INPUT_GOOD : IDR_INPUT_ALERT)); 162 is_valid ? IDR_INPUT_GOOD : IDR_INPUT_ALERT));
162 } 163 }
OLDNEW
« no previous file with comments | « chrome/browser/views/notifications/balloon_view.cc ('k') | chrome/browser/views/page_info_window_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698