chrome/browser/views/bookmark_context_menu_test.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

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/views/bookmark_context_menu_test.cc

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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/scoped_ptr.h"	5 #include "base/scoped_ptr.h"

6 #include "base/utf_string_conversions.h"	6 #include "base/utf_string_conversions.h"

7 #include "chrome/browser/bookmarks/bookmark_model.h"	7 #include "chrome/browser/bookmarks/bookmark_model.h"

8 #include "chrome/browser/bookmarks/bookmark_utils.h"	8 #include "chrome/browser/bookmarks/bookmark_utils.h"

9 #include "chrome/browser/chrome_thread.h"	9 #include "chrome/browser/chrome_thread.h"

10 #include "chrome/browser/pref_service.h"	10 #include "chrome/browser/prefs/pref_service.h"

11 #include "chrome/browser/profile.h"	11 #include "chrome/browser/profile.h"

12 #include "chrome/browser/tab_contents/page_navigator.h"	12 #include "chrome/browser/tab_contents/page_navigator.h"

13 #include "chrome/browser/views/bookmark_context_menu.h"	13 #include "chrome/browser/views/bookmark_context_menu.h"

14 #include "chrome/common/pref_names.h"	14 #include "chrome/common/pref_names.h"

15 #include "chrome/test/testing_profile.h"	15 #include "chrome/test/testing_profile.h"

16 #include "grit/generated_resources.h"	16 #include "grit/generated_resources.h"

17 #include "testing/gtest/include/gtest/gtest.h"	17 #include "testing/gtest/include/gtest/gtest.h"

18	18

19 #if defined(OS_WIN)	19 #if defined(OS_WIN)

20 #include "chrome/browser/views/bookmark_bar_view.h"	20 #include "chrome/browser/views/bookmark_bar_view.h"

(...skipping 281 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
302	302

303 controller.reset(new BookmarkContextMenu(	303 controller.reset(new BookmarkContextMenu(

304 NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));	304 NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));

305 // Cut the URL.	305 // Cut the URL.

306 controller->ExecuteCommand(IDS_CUT);	306 controller->ExecuteCommand(IDS_CUT);

307 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());	307 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());

308 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());	308 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());

309 ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount());	309 ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount());

310 }	310 }

311	311

OLD	NEW