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

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

Issue 10626007: Move ExtensionSystem into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Master merge; moved class declaration 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
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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_nsobject.h" 9 #include "base/memory/scoped_nsobject.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 class BookmarkBarControllerTestBase : public CocoaProfileTest { 268 class BookmarkBarControllerTestBase : public CocoaProfileTest {
269 public: 269 public:
270 scoped_nsobject<NSView> parent_view_; 270 scoped_nsobject<NSView> parent_view_;
271 scoped_nsobject<ViewResizerPong> resizeDelegate_; 271 scoped_nsobject<ViewResizerPong> resizeDelegate_;
272 272
273 virtual void SetUp() { 273 virtual void SetUp() {
274 CocoaProfileTest::SetUp(); 274 CocoaProfileTest::SetUp();
275 ASSERT_TRUE(profile()); 275 ASSERT_TRUE(profile());
276 276
277 FilePath extension_dir; 277 FilePath extension_dir;
278 static_cast<TestExtensionSystem*>( 278 static_cast<extensions::TestExtensionSystem*>(
279 ExtensionSystem::Get(profile()))-> 279 extensions::ExtensionSystem::Get(profile()))->
280 CreateExtensionService( 280 CreateExtensionService(
281 CommandLine::ForCurrentProcess(), 281 CommandLine::ForCurrentProcess(),
282 extension_dir, false); 282 extension_dir, false);
283 resizeDelegate_.reset([[ViewResizerPong alloc] init]); 283 resizeDelegate_.reset([[ViewResizerPong alloc] init]);
284 NSRect parent_frame = NSMakeRect(0, 0, 800, 50); 284 NSRect parent_frame = NSMakeRect(0, 0, 800, 50);
285 parent_view_.reset([[NSView alloc] initWithFrame:parent_frame]); 285 parent_view_.reset([[NSView alloc] initWithFrame:parent_frame]);
286 [parent_view_ setHidden:YES]; 286 [parent_view_ setHidden:YES];
287 } 287 }
288 288
289 void InstallAndToggleBar(BookmarkBarController* bar) { 289 void InstallAndToggleBar(BookmarkBarController* bar) {
(...skipping 1897 matching lines...) Expand 10 before | Expand all | Expand 10 after
2187 "2f3b ] 4b "); 2187 "2f3b ] 4b ");
2188 actual = model_test_utils::ModelStringFromNode(root); 2188 actual = model_test_utils::ModelStringFromNode(root);
2189 EXPECT_EQ(expected, actual); 2189 EXPECT_EQ(expected, actual);
2190 2190
2191 // Verify that the other bookmark folder can't be deleted. 2191 // Verify that the other bookmark folder can't be deleted.
2192 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2192 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2193 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2193 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2194 } 2194 }
2195 2195
2196 } // namespace 2196 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/translate/translate_manager_browsertest.cc ('k') | chrome/browser/ui/views/ash/app_list/extension_app_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698