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

Side by Side Diff: chrome/browser/cocoa/keyword_editor_cocoa_controller.mm

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" 7 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
8 8
9 #import "base/mac_util.h" 9 #import "base/mac_util.h"
10 #include "base/singleton.h" 10 #include "base/singleton.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h" 13 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h"
14 #import "chrome/browser/cocoa/window_size_autosaver.h" 14 #import "chrome/browser/cocoa/window_size_autosaver.h"
15 #include "chrome/browser/pref_service.h" 15 #include "chrome/browser/prefs/pref_service.h"
16 #include "chrome/browser/profile.h" 16 #include "chrome/browser/profile.h"
17 #include "chrome/browser/search_engines/template_url_table_model.h" 17 #include "chrome/browser/search_engines/template_url_table_model.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "skia/ext/skia_utils_mac.h" 20 #include "skia/ext/skia_utils_mac.h"
21 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 21 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
23 23
24 namespace { 24 namespace {
25 25
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 controller_->table_model()->last_search_engine_index() + 1; 412 controller_->table_model()->last_search_engine_index() + 1;
413 DCHECK_NE(row, otherGroupId); 413 DCHECK_NE(row, otherGroupId);
414 if (row >= otherGroupId) { 414 if (row >= otherGroupId) {
415 return row - 2; // Other group. 415 return row - 2; // Other group.
416 } else { 416 } else {
417 return row - 1; // Default group. 417 return row - 1; // Default group.
418 } 418 }
419 } 419 }
420 420
421 @end 421 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698