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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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
OLDNEW
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 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/mac/scoped_nsobject.h" 6 #include "base/mac/scoped_nsobject.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_test_helpers.h" 10 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h"
14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h" 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h" 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"
16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
17 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 17 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
18 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" 18 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
19 #include "chrome/test/base/testing_profile.h" 19 #include "chrome/test/base/testing_profile.h"
20 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
21 #import "testing/gtest_mac.h" 21 #import "testing/gtest_mac.h"
22 #include "testing/platform_test.h" 22 #include "testing/platform_test.h"
23 #include "ui/base/cocoa/animation_utils.h" 23 #include "ui/base/cocoa/animation_utils.h"
24 24
25 using base::ASCIIToUTF16;
25 26
26 namespace { 27 namespace {
27 28
28 const int kLotsOfNodesCount = 150; 29 const int kLotsOfNodesCount = 150;
29 30
30 // Deletes the bookmark corresponding to |button|. 31 // Deletes the bookmark corresponding to |button|.
31 void DeleteBookmark(BookmarkButton* button, Profile* profile) { 32 void DeleteBookmark(BookmarkButton* button, Profile* profile) {
32 const BookmarkNode* node = [button bookmarkNode]; 33 const BookmarkNode* node = [button bookmarkNode];
33 if (node) { 34 if (node) {
34 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); 35 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
(...skipping 1565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1600 DeleteBookmark([folder parentButton], profile()); 1601 DeleteBookmark([folder parentButton], profile());
1601 EXPECT_FALSE([folder folderController]); 1602 EXPECT_FALSE([folder folderController]);
1602 } 1603 }
1603 1604
1604 // TODO(jrg): draggingEntered: and draggingExited: trigger timers so 1605 // TODO(jrg): draggingEntered: and draggingExited: trigger timers so
1605 // they are hard to test. Factor out "fire timers" into routines 1606 // they are hard to test. Factor out "fire timers" into routines
1606 // which can be overridden to fire immediately to make behavior 1607 // which can be overridden to fire immediately to make behavior
1607 // confirmable. 1608 // confirmable.
1608 // There is a similar problem with mouseEnteredButton: and 1609 // There is a similar problem with mouseEnteredButton: and
1609 // mouseExitedButton:. 1610 // mouseExitedButton:.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698