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

Side by Side Diff: chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm

Issue 6046009: Move base/mac_util.h to base/mac and use the base::mac namespace.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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/cocoa/file_metadata.mm ('k') | chrome/browser/ui/cocoa/first_run_dialog.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "base/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "chrome/browser/renderer_host/render_view_host.h" 9 #include "chrome/browser/renderer_host/render_view_host.h"
10 #include "chrome/browser/tab_contents/tab_contents.h" 10 #include "chrome/browser/tab_contents/tab_contents.h"
11 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 11 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
12 #import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h" 12 #import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h"
13 #import "chrome/browser/ui/cocoa/find_bar_bridge.h" 13 #import "chrome/browser/ui/cocoa/find_bar_bridge.h"
14 #import "chrome/browser/ui/cocoa/find_bar_text_field.h" 14 #import "chrome/browser/ui/cocoa/find_bar_text_field.h"
15 #import "chrome/browser/ui/cocoa/find_bar_text_field_cell.h" 15 #import "chrome/browser/ui/cocoa/find_bar_text_field_cell.h"
16 #import "chrome/browser/ui/cocoa/find_pasteboard.h" 16 #import "chrome/browser/ui/cocoa/find_pasteboard.h"
17 #import "chrome/browser/ui/cocoa/focus_tracker.h" 17 #import "chrome/browser/ui/cocoa/focus_tracker.h"
(...skipping 17 matching lines...) Expand all
35 35
36 // Optionally stops the current search, puts |text| into the find bar, and 36 // Optionally stops the current search, puts |text| into the find bar, and
37 // enables the buttons, but doesn't start a new search for |text|. 37 // enables the buttons, but doesn't start a new search for |text|.
38 - (void)prepopulateText:(NSString*)text stopSearch:(BOOL)stopSearch; 38 - (void)prepopulateText:(NSString*)text stopSearch:(BOOL)stopSearch;
39 @end 39 @end
40 40
41 @implementation FindBarCocoaController 41 @implementation FindBarCocoaController
42 42
43 - (id)init { 43 - (id)init {
44 if ((self = [super initWithNibName:@"FindBar" 44 if ((self = [super initWithNibName:@"FindBar"
45 bundle:mac_util::MainAppBundle()])) { 45 bundle:base::mac::MainAppBundle()])) {
46 [[NSNotificationCenter defaultCenter] 46 [[NSNotificationCenter defaultCenter]
47 addObserver:self 47 addObserver:self
48 selector:@selector(findPboardUpdated:) 48 selector:@selector(findPboardUpdated:)
49 name:kFindPasteboardChangedNotification 49 name:kFindPasteboardChangedNotification
50 object:[FindPasteboard sharedInstance]]; 50 object:[FindPasteboard sharedInstance]];
51 } 51 }
52 return self; 52 return self;
53 } 53 }
54 54
55 - (void)dealloc { 55 - (void)dealloc {
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 } 375 }
376 } 376 }
377 377
378 // Has to happen after |ClearResults()| above. 378 // Has to happen after |ClearResults()| above.
379 BOOL buttonsEnabled = [text length] > 0 ? YES : NO; 379 BOOL buttonsEnabled = [text length] > 0 ? YES : NO;
380 [previousButton_ setEnabled:buttonsEnabled]; 380 [previousButton_ setEnabled:buttonsEnabled];
381 [nextButton_ setEnabled:buttonsEnabled]; 381 [nextButton_ setEnabled:buttonsEnabled];
382 } 382 }
383 383
384 @end 384 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/file_metadata.mm ('k') | chrome/browser/ui/cocoa/first_run_dialog.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698