chrome/browser/ui/views/options/exception_editor_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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/ui/views/options/cookies_view.cc ('k') | chrome/browser/ui/views/options/exceptions_page_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 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/views/options/exception_editor_view.h"	5 #include "chrome/browser/ui/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 "base/utf_string_conversions.h"

10 #include "chrome/browser/content_exceptions_table_model.h"	10 #include "chrome/browser/content_exceptions_table_model.h"

11 #include "googleurl/src/url_canon.h"	11 #include "googleurl/src/url_canon.h"

12 #include "googleurl/src/url_parse.h"	12 #include "googleurl/src/url_parse.h"

13 #include "grit/app_resources.h"	13 #include "grit/app_resources.h"

14 #include "grit/generated_resources.h"	14 #include "grit/generated_resources.h"

15 #include "grit/theme_resources.h"	15 #include "grit/theme_resources.h"

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 return is_new() ? is_valid_pattern : (!pattern.AsString().empty() &&	169 return is_new() ? is_valid_pattern : (!pattern.AsString().empty() &&

170 ((pattern_ == pattern) \|\| is_valid_pattern));	170 ((pattern_ == pattern) \|\| is_valid_pattern));

171 }	171 }

172	172

173 void ExceptionEditorView::UpdateImageView(views::ImageView* image_view,	173 void ExceptionEditorView::UpdateImageView(views::ImageView* image_view,

174 bool is_valid) {	174 bool is_valid) {

175 return image_view->SetImage(	175 return image_view->SetImage(

176 ResourceBundle::GetSharedInstance().GetBitmapNamed(	176 ResourceBundle::GetSharedInstance().GetBitmapNamed(

177 is_valid ? IDR_INPUT_GOOD : IDR_INPUT_ALERT));	177 is_valid ? IDR_INPUT_GOOD : IDR_INPUT_ALERT));

178 }	178 }

OLD	NEW