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

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

Issue 6598086: Update more includes that were pointing to the old locations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 9 years, 9 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 "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util-inl.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_node_data.h" 10 #include "chrome/browser/bookmarks/bookmark_node_data.h"
11 #include "chrome/browser/bookmarks/bookmark_utils.h" 11 #include "chrome/browser/bookmarks/bookmark_utils.h"
12 #include "chrome/browser/metrics/user_metrics.h" 12 #include "chrome/browser/metrics/user_metrics.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/tab_contents/page_navigator.h"
15 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 14 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
16 #include "chrome/browser/ui/views/event_utils.h" 15 #include "chrome/browser/ui/views/event_utils.h"
17 #include "chrome/common/page_transition_types.h" 16 #include "chrome/common/page_transition_types.h"
17 #include "content/browser/tab_contents/page_navigator.h"
18 #include "grit/app_resources.h" 18 #include "grit/app_resources.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "grit/theme_resources.h" 20 #include "grit/theme_resources.h"
21 #include "ui/base/dragdrop/os_exchange_data.h" 21 #include "ui/base/dragdrop/os_exchange_data.h"
22 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 #include "views/controls/button/menu_button.h" 23 #include "views/controls/button/menu_button.h"
24 24
25 using views::MenuItemView; 25 using views::MenuItemView;
26 26
27 // Max width of a menu. There does not appear to be an OS value for this, yet 27 // Max width of a menu. There does not appear to be an OS value for this, yet
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 break; 417 break;
418 } 418 }
419 } 419 }
420 if (ancestor_removed) { 420 if (ancestor_removed) {
421 node_to_menu_id_map_.erase(i++); 421 node_to_menu_id_map_.erase(i++);
422 } else { 422 } else {
423 ++i; 423 ++i;
424 } 424 }
425 } 425 }
426 } 426 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698