chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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/bookmarks/bookmark_editor_controller.mm

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_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) 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 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"	5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"

6	6

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "base/strings/string16.h"	8 #include "base/strings/string16.h"

9 #include "base/strings/sys_string_conversions.h"	9 #include "base/strings/sys_string_conversions.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"	11 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"

12 #include "chrome/common/net/url_fixer_upper.h"	12 #include "chrome/common/net/url_fixer_upper.h"

13 #include "components/bookmarks/core/browser/bookmark_expanded_state_tracker.h"	13 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"

14 #include "components/bookmarks/core/browser/bookmark_model.h"	14 #include "components/bookmarks/browser/bookmark_model.h"

15 #include "components/user_prefs/user_prefs.h"	15 #include "components/user_prefs/user_prefs.h"

16 #include "ui/base/l10n/l10n_util.h"	16 #include "ui/base/l10n/l10n_util.h"

17	17

18 @interface BookmarkEditorController (Private)	18 @interface BookmarkEditorController (Private)

19	19

20 // Grab the url from the text field and convert.	20 // Grab the url from the text field and convert.

21 - (GURL)GURLFromUrlField;	21 - (GURL)GURLFromUrlField;

22	22

23 @end	23 @end

24	24

(...skipping 137 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 SetExpandedNodes(expanded_nodes);	162 SetExpandedNodes(expanded_nodes);

163 return [NSNumber numberWithBool:YES];	163 return [NSNumber numberWithBool:YES];

164 }	164 }

165	165

166 - (NSColor *)urlFieldColor {	166 - (NSColor *)urlFieldColor {

167 return [urlField_ backgroundColor];	167 return [urlField_ backgroundColor];

168 }	168 }

169	169

170 @end // BookmarkEditorController	170 @end // BookmarkEditorController

171	171

OLD	NEW