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

Side by Side Diff: chrome/browser/extensions/context_menu_matcher.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 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
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/extensions/context_menu_matcher.h" 5 #include "chrome/browser/extensions/context_menu_matcher.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/extensions/extension_util.h" 10 #include "chrome/browser/extensions/extension_util.h"
10 #include "chrome/common/extensions/api/context_menus.h" 11 #include "chrome/common/extensions/api/context_menus.h"
11 #include "content/public/browser/browser_context.h" 12 #include "content/public/browser/browser_context.h"
12 #include "content/public/common/context_menu_params.h" 13 #include "content/public/common/context_menu_params.h"
13 #include "extensions/browser/extension_registry.h" 14 #include "extensions/browser/extension_registry.h"
14 #include "ui/gfx/favicon_size.h" 15 #include "ui/gfx/favicon_size.h"
15 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
16 17
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 kMaxExtensionItemTitleLength); 107 kMaxExtensionItemTitleLength);
107 submenu_items = GetRelevantExtensionItems(item->children(), 108 submenu_items = GetRelevantExtensionItems(item->children(),
108 can_cross_incognito); 109 can_cross_incognito);
109 } 110 }
110 111
111 // Now add our item(s) to the menu_model_. 112 // Now add our item(s) to the menu_model_.
112 if (submenu_items.empty()) { 113 if (submenu_items.empty()) {
113 menu_model_->AddItem(menu_id, title); 114 menu_model_->AddItem(menu_id, title);
114 } else { 115 } else {
115 ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(delegate_); 116 ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(delegate_);
116 extension_menu_models_.push_back(make_scoped_ptr(submenu)); 117 extension_menu_models_.push_back(base::WrapUnique(submenu));
117 menu_model_->AddSubMenu(menu_id, title, submenu); 118 menu_model_->AddSubMenu(menu_id, title, submenu);
118 RecursivelyAppendExtensionItems(submenu_items, can_cross_incognito, 119 RecursivelyAppendExtensionItems(submenu_items, can_cross_incognito,
119 selection_text, submenu, index, 120 selection_text, submenu, index,
120 false); // is_action_menu_top_level 121 false); // is_action_menu_top_level
121 } 122 }
122 if (!is_action_menu) 123 if (!is_action_menu)
123 SetExtensionIcon(extension_key.extension_id); 124 SetExtensionIcon(extension_key.extension_id);
124 } 125 }
125 } 126 }
126 127
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 extension_item_map_[menu_id] = item->id(); 260 extension_item_map_[menu_id] = item->id();
260 base::string16 title = item->TitleWithReplacement(selection_text, 261 base::string16 title = item->TitleWithReplacement(selection_text,
261 kMaxExtensionItemTitleLength); 262 kMaxExtensionItemTitleLength);
262 if (item->type() == MenuItem::NORMAL) { 263 if (item->type() == MenuItem::NORMAL) {
263 MenuItem::List children = 264 MenuItem::List children =
264 GetRelevantExtensionItems(item->children(), can_cross_incognito); 265 GetRelevantExtensionItems(item->children(), can_cross_incognito);
265 if (children.empty()) { 266 if (children.empty()) {
266 menu_model->AddItem(menu_id, title); 267 menu_model->AddItem(menu_id, title);
267 } else { 268 } else {
268 ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(delegate_); 269 ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(delegate_);
269 extension_menu_models_.push_back(make_scoped_ptr(submenu)); 270 extension_menu_models_.push_back(base::WrapUnique(submenu));
270 menu_model->AddSubMenu(menu_id, title, submenu); 271 menu_model->AddSubMenu(menu_id, title, submenu);
271 RecursivelyAppendExtensionItems(children, can_cross_incognito, 272 RecursivelyAppendExtensionItems(children, can_cross_incognito,
272 selection_text, submenu, index, 273 selection_text, submenu, index,
273 false); // is_action_menu_top_level 274 false); // is_action_menu_top_level
274 } 275 }
275 } else if (item->type() == MenuItem::CHECKBOX) { 276 } else if (item->type() == MenuItem::CHECKBOX) {
276 menu_model->AddCheckItem(menu_id, title); 277 menu_model->AddCheckItem(menu_id, title);
277 } else if (item->type() == MenuItem::RADIO) { 278 } else if (item->type() == MenuItem::RADIO) {
278 if (i != items.begin() && 279 if (i != items.begin() &&
279 last_type != MenuItem::RADIO) { 280 last_type != MenuItem::RADIO) {
(...skipping 30 matching lines...) Expand all
310 DCHECK_GE(index, 0); 311 DCHECK_GE(index, 0);
311 312
312 const SkBitmap& icon = menu_manager->GetIconForExtension(extension_id); 313 const SkBitmap& icon = menu_manager->GetIconForExtension(extension_id);
313 DCHECK(icon.width() == gfx::kFaviconSize); 314 DCHECK(icon.width() == gfx::kFaviconSize);
314 DCHECK(icon.height() == gfx::kFaviconSize); 315 DCHECK(icon.height() == gfx::kFaviconSize);
315 316
316 menu_model_->SetIcon(index, gfx::Image::CreateFrom1xBitmap(icon)); 317 menu_model_->SetIcon(index, gfx::Image::CreateFrom1xBitmap(icon));
317 } 318 }
318 319
319 } // namespace extensions 320 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/context_menu_matcher.h ('k') | chrome/browser/extensions/convert_user_script.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698