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

Side by Side Diff: chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc

Issue 6122006: Cleanup: Remove unneeded includes of pref_names.h (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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string>
6
5 #include "base/scoped_ptr.h" 7 #include "base/scoped_ptr.h"
6 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
7 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h" 10 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
11 #include "chrome/browser/browser_thread.h" 13 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/tab_contents/page_navigator.h" 16 #include "chrome/browser/tab_contents/page_navigator.h"
15 #include "chrome/common/pref_names.h"
16 #include "chrome/test/testing_profile.h" 17 #include "chrome/test/testing_profile.h"
17 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 20
20 #if defined(OS_WIN) 21 #if defined(OS_WIN)
21 #include "chrome/browser/ui/views/bookmark_bar_view.h" 22 #include "chrome/browser/ui/views/bookmark_bar_view.h"
22 #endif 23 #endif
23 24
24 // PageNavigator implementation that records the URL. 25 // PageNavigator implementation that records the URL.
25 class TestingPageNavigator : public PageNavigator { 26 class TestingPageNavigator : public PageNavigator {
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 model_->GetBookmarkBarNode()->GetChild(1)->GetURL()); 309 model_->GetBookmarkBarNode()->GetChild(1)->GetURL());
309 310
310 controller.reset(new BookmarkContextMenuController( 311 controller.reset(new BookmarkContextMenuController(
311 NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes)); 312 NULL, NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes));
312 // Cut the URL. 313 // Cut the URL.
313 controller->ExecuteCommand(IDC_CUT); 314 controller->ExecuteCommand(IDC_CUT);
314 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url()); 315 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url());
315 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder()); 316 ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder());
316 ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount()); 317 ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount());
317 } 318 }
OLDNEW
« no previous file with comments | « chrome/browser/background_mode_manager_unittest.cc ('k') | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698