chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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/cocoa/browser/edit_search_engine_cocoa_controller.mm

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 8 years, 5 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

« chrome/browser/resources_util.cc ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"	5 #import "chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/mac/bundle_locations.h"	8 #include "base/mac/bundle_locations.h"

9 #import "base/mac/mac_util.h"	9 #import "base/mac/mac_util.h"

10 #include "base/string16.h"	10 #include "base/string16.h"

11 #include "base/sys_string_conversions.h"	11 #include "base/sys_string_conversions.h"

12 #include "chrome/browser/search_engines/template_url.h"	12 #include "chrome/browser/search_engines/template_url.h"

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

14 #include "grit/theme_resources_standard.h"	14 #include "grit/theme_resources.h"

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

16 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"	16 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"

17 #include "ui/base/l10n/l10n_util_mac.h"	17 #include "ui/base/l10n/l10n_util_mac.h"

18 #include "ui/base/resource/resource_bundle.h"	18 #include "ui/base/resource/resource_bundle.h"

19 #include "ui/gfx/image/image.h"	19 #include "ui/gfx/image/image.h"

20	20

21 namespace {	21 namespace {

22	22

23 void ShiftOriginY(NSView* view, CGFloat amount) {	23 void ShiftOriginY(NSView* view, CGFloat amount) {

24 NSPoint origin = [view frame].origin;	24 NSPoint origin = [view frame].origin;

(...skipping 154 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
179 toolTip:IDS_SEARCH_ENGINES_INVALID_URL_TT	179 toolTip:IDS_SEARCH_ENGINES_INVALID_URL_TT

180 forImageView:urlImage_	180 forImageView:urlImage_

181 textField:urlField_];	181 textField:urlField_];

182	182

183 BOOL isValid = (titleValid && keywordValid && urlValid);	183 BOOL isValid = (titleValid && keywordValid && urlValid);

184 [doneButton_ setEnabled:isValid];	184 [doneButton_ setEnabled:isValid];

185 return isValid;	185 return isValid;

186 }	186 }

187	187

188 @end	188 @end

OLD	NEW