| OLD | NEW | 
|---|
| 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 #include <vector> | 
|  | 7 | 
| 5 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" | 
| 6 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" | 
| 7 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" | 
| 8 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" | 
| 9 #include "chrome/browser/bookmarks/bookmark_utils.h" | 12 #include "chrome/browser/bookmarks/bookmark_utils.h" | 
| 10 #include "chrome/browser/browser_thread.h" | 13 #include "chrome/browser/browser_thread.h" | 
| 11 #include "chrome/browser/prefs/pref_service.h" | 14 #include "chrome/browser/prefs/pref_service.h" | 
| 12 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" | 
| 13 #include "chrome/browser/tab_contents/page_navigator.h" | 16 #include "chrome/browser/tab_contents/page_navigator.h" | 
| 14 #include "chrome/browser/ui/views/bookmark_context_menu.h" | 17 #include "chrome/browser/ui/views/bookmark_context_menu.h" | 
| 15 #include "chrome/common/pref_names.h" |  | 
| 16 #include "chrome/test/testing_profile.h" | 18 #include "chrome/test/testing_profile.h" | 
| 17 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" | 
| 18 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" | 
| 19 | 21 | 
| 20 #if defined(OS_WIN) | 22 #if defined(OS_WIN) | 
| 21 #include "chrome/browser/ui/views/bookmark_bar_view.h" | 23 #include "chrome/browser/ui/views/bookmark_bar_view.h" | 
| 22 #endif | 24 #endif | 
| 23 | 25 | 
| 24 namespace { | 26 namespace { | 
| 25 | 27 | 
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 307             model_->GetBookmarkBarNode()->GetChild(1)->GetURL()); | 309             model_->GetBookmarkBarNode()->GetChild(1)->GetURL()); | 
| 308 | 310 | 
| 309   controller.reset(new BookmarkContextMenu( | 311   controller.reset(new BookmarkContextMenu( | 
| 310       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes)); | 312       NULL, profile_.get(), NULL, nodes[0]->GetParent(), nodes)); | 
| 311   // Cut the URL. | 313   // Cut the URL. | 
| 312   controller->ExecuteCommand(IDC_CUT); | 314   controller->ExecuteCommand(IDC_CUT); | 
| 313   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url()); | 315   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(0)->is_url()); | 
| 314   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder()); | 316   ASSERT_TRUE(model_->GetBookmarkBarNode()->GetChild(1)->is_folder()); | 
| 315   ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount()); | 317   ASSERT_EQ(old_count, model_->GetBookmarkBarNode()->GetChildCount()); | 
| 316 } | 318 } | 
| 317 |  | 
| OLD | NEW | 
|---|