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

Side by Side Diff: chrome/browser/ui/views/wrench_menu.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wrench_menu.h" 5 #include "chrome/browser/ui/views/wrench_menu.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <set> 9 #include <set>
10 10
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
14 #include "chrome/browser/bookmarks/bookmark_model.h" 14 #include "chrome/browser/bookmarks/bookmark_model.h"
15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/search/search.h" 17 #include "chrome/browser/search/search.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" 21 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
22 #include "chrome/common/chrome_notification_types.h" 22 #include "chrome/common/chrome_notification_types.h"
(...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 bookmark_menu_delegate_.reset( 1169 bookmark_menu_delegate_.reset(
1170 new BookmarkMenuDelegate(browser_, 1170 new BookmarkMenuDelegate(browser_,
1171 browser_, 1171 browser_,
1172 parent, 1172 parent,
1173 first_bookmark_command_id_)); 1173 first_bookmark_command_id_));
1174 bookmark_menu_delegate_->Init( 1174 bookmark_menu_delegate_->Init(
1175 this, bookmark_menu_, model->bookmark_bar_node(), 0, 1175 this, bookmark_menu_, model->bookmark_bar_node(), 0,
1176 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS, 1176 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
1177 bookmark_utils::LAUNCH_WRENCH_MENU); 1177 bookmark_utils::LAUNCH_WRENCH_MENU);
1178 } 1178 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698