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

Side by Side Diff: chrome/browser/ui/toolbar/action_box_button_controller.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/toolbar/action_box_button_controller.h" 5 #include "chrome/browser/ui/toolbar/action_box_button_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #include "chrome/browser/chrome_to_mobile_service.h" 11 #include "chrome/browser/chrome_to_mobile_service.h"
12 #include "chrome/browser/extensions/api/page_launcher/page_launcher_api.h" 12 #include "chrome/browser/extensions/api/page_launcher/page_launcher_api.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/extensions/extension_system.h" 14 #include "chrome/browser/extensions/extension_system.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 16 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_commands.h" 18 #include "chrome/browser/ui/browser_commands.h"
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 for (ExtensionIdCommandMap::iterator it = extension_command_ids_.begin(); 185 for (ExtensionIdCommandMap::iterator it = extension_command_ids_.begin();
186 it != extension_command_ids_.end();) { 186 it != extension_command_ids_.end();) {
187 if (it->second== extension->id()) 187 if (it->second== extension->id())
188 extension_command_ids_.erase(it++); 188 extension_command_ids_.erase(it++);
189 else 189 else
190 ++it; 190 ++it;
191 } 191 }
192 // TODO(kalman): if there's a menu open, remove it from that too. 192 // TODO(kalman): if there's a menu open, remove it from that too.
193 // We may also want to listen to EXTENSION_LOADED to do the opposite. 193 // We may also want to listen to EXTENSION_LOADED to do the opposite.
194 } 194 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/test/test_confirm_bubble_model.cc ('k') | chrome/browser/ui/toolbar/action_box_context_menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698