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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_context_menu.cc

Issue 16871010: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/ash/launcher/launcher_context_menu.h" 5 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/desktop_background/user_wallpaper_delegate.h" 9 #include "ash/desktop_background/user_wallpaper_delegate.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 24 matching lines...) Expand all
35 35
36 } // namespace 36 } // namespace
37 37
38 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller, 38 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
39 const ash::LauncherItem* item, 39 const ash::LauncherItem* item,
40 aura::RootWindow* root) 40 aura::RootWindow* root)
41 : ui::SimpleMenuModel(NULL), 41 : ui::SimpleMenuModel(NULL),
42 controller_(controller), 42 controller_(controller),
43 item_(*item), 43 item_(*item),
44 launcher_alignment_menu_(root), 44 launcher_alignment_menu_(root),
45 extension_items_(NULL),
46 root_window_(root) { 45 root_window_(root) {
47 DCHECK(item); 46 DCHECK(item);
48 DCHECK(root_window_); 47 DCHECK(root_window_);
49 Init(); 48 Init();
50 } 49 }
51 50
52 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller, 51 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
53 aura::RootWindow* root) 52 aura::RootWindow* root)
54 : ui::SimpleMenuModel(NULL), 53 : ui::SimpleMenuModel(NULL),
55 controller_(controller), 54 controller_(controller),
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 case MENU_CHANGE_WALLPAPER: 278 case MENU_CHANGE_WALLPAPER:
280 ash::Shell::GetInstance()->user_wallpaper_delegate()-> 279 ash::Shell::GetInstance()->user_wallpaper_delegate()->
281 OpenSetWallpaperPage(); 280 OpenSetWallpaperPage();
282 break; 281 break;
283 #endif 282 #endif
284 default: 283 default:
285 extension_items_->ExecuteCommand(command_id, NULL, 284 extension_items_->ExecuteCommand(command_id, NULL,
286 content::ContextMenuParams()); 285 content::ContextMenuParams());
287 } 286 }
288 } 287 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698