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

Side by Side Diff: chrome/browser/ui/views/browser_action_view.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/browser_action_view.h" 5 #include "chrome/browser/ui/views/browser_action_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/api/commands/command_service.h" 8 #include "chrome/browser/extensions/api/commands/command_service.h"
9 #include "chrome/browser/extensions/extension_action.h" 9 #include "chrome/browser/extensions/extension_action.h"
10 #include "chrome/browser/extensions/extension_action_manager.h" 10 #include "chrome/browser/extensions/extension_action_manager.h"
11 #include "chrome/browser/extensions/extension_context_menu_model.h" 11 #include "chrome/browser/extensions/extension_context_menu_model.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/views/browser_actions_container.h" 14 #include "chrome/browser/ui/views/browser_actions_container.h"
15 #include "chrome/browser/ui/views/toolbar_view.h" 15 #include "chrome/browser/ui/views/toolbar_view.h"
16 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
17 #include "chrome/common/extensions/extension.h" 17 #include "chrome/common/extensions/extension.h"
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 extensions::Command browser_action_command; 403 extensions::Command browser_action_command;
404 if (!only_if_active || !command_service->GetBrowserActionCommand( 404 if (!only_if_active || !command_service->GetBrowserActionCommand(
405 extension_->id(), 405 extension_->id(),
406 extensions::CommandService::ACTIVE_ONLY, 406 extensions::CommandService::ACTIVE_ONLY,
407 &browser_action_command, 407 &browser_action_command,
408 NULL)) { 408 NULL)) {
409 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this); 409 GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
410 keybinding_.reset(NULL); 410 keybinding_.reset(NULL);
411 } 411 }
412 } 412 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/browser_action_test_util_views.cc ('k') | chrome/browser/ui/views/button_dropdown_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698