chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc ('k') | chrome/browser/ui/views/constrained_html_delegate_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"	5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/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_node_data.h"	9 #include "chrome/browser/bookmarks/bookmark_node_data.h"

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

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

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"	13 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"

14 #include "chrome/browser/ui/views/event_utils.h"	14 #include "chrome/browser/ui/views/event_utils.h"

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

16 #include "content/browser/tab_contents/page_navigator.h"	16 #include "content/browser/tab_contents/page_navigator.h"

17 #include "content/browser/user_metrics.h"	17 #include "content/browser/user_metrics.h"

18 #include "content/common/page_transition_types.h"

19 #include "grit/generated_resources.h"	18 #include "grit/generated_resources.h"

20 #include "grit/theme_resources.h"	19 #include "grit/theme_resources.h"

21 #include "grit/ui_resources.h"	20 #include "grit/ui_resources.h"

22 #include "ui/base/dragdrop/os_exchange_data.h"	21 #include "ui/base/dragdrop/os_exchange_data.h"

23 #include "ui/base/l10n/l10n_util.h"	22 #include "ui/base/l10n/l10n_util.h"

24 #include "ui/base/resource/resource_bundle.h"	23 #include "ui/base/resource/resource_bundle.h"

25 #include "views/controls/button/menu_button.h"	24 #include "views/controls/button/menu_button.h"

26 #include "views/controls/menu/menu_item_view.h"	25 #include "views/controls/menu/menu_item_view.h"

27 #include "views/controls/menu/submenu_view.h"	26 #include "views/controls/menu/submenu_view.h"

28 #include "views/widget/widget.h"	27 #include "views/widget/widget.h"

(...skipping 411 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
440 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) {	439 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) {

441 for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin();	440 for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin();

442 i != node_to_menu_map_.end(); ++i) {	441 i != node_to_menu_map_.end(); ++i) {

443 MenuItemView* menu = i->second->GetMenuItemByID(id);	442 MenuItemView* menu = i->second->GetMenuItemByID(id);

444 if (menu)	443 if (menu)

445 return menu;	444 return menu;

446 }	445 }

447	446

448 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL;	447 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL;

449 }	448 }

OLD	NEW