diff options
13 files changed, 40 insertions, 40 deletions
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc index 5c7f11c..f0c3b4a 100644 --- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc @@ -108,11 +108,11 @@ void AppShortcutLauncherItemController::LauncherItemChanged( const ash::LauncherItem& old_item) { } -ChromeLauncherAppMenuItems* +ChromeLauncherAppMenuItems AppShortcutLauncherItemController::GetApplicationList() { - ChromeLauncherAppMenuItems* items = new ChromeLauncherAppMenuItems; + ChromeLauncherAppMenuItems items; // Add the application name to the menu. - items->push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL)); + items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL)); std::vector<content::WebContents*> content_list = GetRunningApplications(); @@ -121,12 +121,12 @@ AppShortcutLauncherItemController::GetApplicationList() { content::WebContents* web_contents = content_list[i]; // Get the icon. gfx::Image app_icon = app_controller_->GetAppListIcon(web_contents); - items->push_back(new ChromeLauncherAppMenuItemTab( - web_contents->GetTitle(), - app_icon.IsEmpty() ? NULL : &app_icon, - web_contents)); + items.push_back(new ChromeLauncherAppMenuItemTab( + web_contents->GetTitle(), + app_icon.IsEmpty() ? NULL : &app_icon, + web_contents)); } - return items; + return items.Pass(); } std::vector<content::WebContents*> diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h index 47b33f1..9ccb7a3 100644 --- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h +++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h @@ -38,7 +38,7 @@ class AppShortcutLauncherItemController : public LauncherItemController { virtual void LauncherItemChanged( int model_index, const ash::LauncherItem& old_item) OVERRIDE; - virtual ChromeLauncherAppMenuItems* GetApplicationList() OVERRIDE; + virtual ChromeLauncherAppMenuItems GetApplicationList() OVERRIDE; std::vector<content::WebContents*> GetRunningApplications(); // Get the refocus url pattern, which can be used to identify this application diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc index 113a0b2..f0b6de8 100644 --- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc @@ -12,6 +12,7 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -168,10 +169,11 @@ void BrowserLauncherItemController::LauncherItemChanged( } } -ChromeLauncherAppMenuItems* +ChromeLauncherAppMenuItems BrowserLauncherItemController::GetApplicationList() { // This will never be called and the entire class will go away. - return new ChromeLauncherAppMenuItems; + ChromeLauncherAppMenuItems items; + return items.Pass(); } void BrowserLauncherItemController::ActiveTabChanged( diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h index dde726c..60bef83 100644 --- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h +++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h @@ -80,7 +80,7 @@ class BrowserLauncherItemController : public LauncherItemController, virtual void OnRemoved() OVERRIDE; virtual void LauncherItemChanged(int index, const ash::LauncherItem& old_item) OVERRIDE; - virtual ChromeLauncherAppMenuItems* GetApplicationList() OVERRIDE; + virtual ChromeLauncherAppMenuItems GetApplicationList() OVERRIDE; // TabStripModel overrides: virtual void ActiveTabChanged(content::WebContents* old_contents, diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc index 5b6fd4f..e17f2ce 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc @@ -810,7 +810,7 @@ ui::MenuModel* ChromeLauncherControllerPerApp::CreateContextMenu( ui::MenuModel* ChromeLauncherControllerPerApp::CreateApplicationMenu( const ash::LauncherItem& item) { return new LauncherApplicationMenuItemModel( - scoped_ptr<ChromeLauncherAppMenuItems>(GetApplicationList(item))); + GetApplicationList(item)); } ash::LauncherID ChromeLauncherControllerPerApp::GetIDByWindow( @@ -962,7 +962,7 @@ void ChromeLauncherControllerPerApp::ExtensionEnableFlowAborted( extension_enable_flow_.reset(); } -ChromeLauncherAppMenuItems* ChromeLauncherControllerPerApp::GetApplicationList( +ChromeLauncherAppMenuItems ChromeLauncherControllerPerApp::GetApplicationList( const ash::LauncherItem& item) { if (item.type == ash::TYPE_BROWSER_SHORTCUT) return GetBrowserApplicationList(); @@ -1323,11 +1323,11 @@ ChromeLauncherControllerPerApp::GetV1ApplicationsFromController( return app_controller->GetRunningApplications(); } -ChromeLauncherAppMenuItems* +ChromeLauncherAppMenuItems ChromeLauncherControllerPerApp::GetBrowserApplicationList() { - ChromeLauncherAppMenuItems* items = new ChromeLauncherAppMenuItems; + ChromeLauncherAppMenuItems items; // Add the application name to the menu. - items->push_back(new ChromeLauncherAppMenuItem( + items.push_back(new ChromeLauncherAppMenuItem( l10n_util::GetStringFUTF16(IDS_LAUNCHER_CHROME_BROWSER_NAME, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)), NULL)); int index = 1; @@ -1339,10 +1339,10 @@ ChromeLauncherControllerPerApp::GetBrowserApplicationList() { WebContents* web_contents = tab_strip->GetWebContentsAt(tab_strip->active_index()); gfx::Image app_icon = GetAppListIcon(web_contents); - items->push_back(new ChromeLauncherAppMenuItemBrowser( - web_contents->GetTitle(), - app_icon.IsEmpty() ? NULL : &app_icon, - browser)); + items.push_back(new ChromeLauncherAppMenuItemBrowser( + web_contents->GetTitle(), + app_icon.IsEmpty() ? NULL : &app_icon, + browser)); } - return items; + return items.Pass(); } diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h index 074960a..cd8343c 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h @@ -277,8 +277,7 @@ class ChromeLauncherControllerPerApp : public ash::LauncherModelObserver, const gfx::ImageSkia& image) OVERRIDE; // Get the list of all running incarnations of this item. - ChromeLauncherAppMenuItems* GetApplicationList( - const ash::LauncherItem& item); + ChromeLauncherAppMenuItems GetApplicationList(const ash::LauncherItem& item); // Get the list of all tabs which belong to a certain application type. std::vector<content::WebContents*> GetV1ApplicationsFromAppId( @@ -371,7 +370,7 @@ class ChromeLauncherControllerPerApp : public ash::LauncherModelObserver, // Returns the list of all browsers runing. // TODO(skuhne): Move to wherever the BrowserLauncherItemController // functionality moves to. - ChromeLauncherAppMenuItems* GetBrowserApplicationList(); + ChromeLauncherAppMenuItems GetBrowserApplicationList(); ash::LauncherModel* model_; diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc index 481363c..66f2f66 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc @@ -285,9 +285,7 @@ void CheckMenuCreation(ChromeLauncherControllerPerApp* controller, const ash::LauncherItem& item, size_t expected_items, string16 title[]) { - scoped_ptr<ChromeLauncherAppMenuItems> - app_list(controller->GetApplicationList(item)); - ChromeLauncherAppMenuItems items(app_list.get()); + ChromeLauncherAppMenuItems items = controller->GetApplicationList(item); // There should be one item in there: The title. EXPECT_EQ(expected_items + 1, items.size()); EXPECT_FALSE(items[0]->IsEnabled()); diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc index a6c27a3..6d0028c 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc @@ -116,8 +116,9 @@ class AppShortcutLauncherItemController : public LauncherItemController { const ash::LauncherItem& old_item) OVERRIDE { } - virtual ChromeLauncherAppMenuItems* GetApplicationList() OVERRIDE { - return new ChromeLauncherAppMenuItems; + virtual ChromeLauncherAppMenuItems GetApplicationList() OVERRIDE { + ChromeLauncherAppMenuItems items; + return items.Pass(); } // Stores the optional refocus url pattern for this item. diff --git a/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.cc b/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.cc index 23e1fc9..efb7ff9 100644 --- a/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.cc +++ b/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.cc @@ -7,9 +7,9 @@ #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h" LauncherApplicationMenuItemModel::LauncherApplicationMenuItemModel( - scoped_ptr<ChromeLauncherAppMenuItems> item_list) + ChromeLauncherAppMenuItems item_list) : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)), - launcher_items_(item_list.get()) { + launcher_items_(item_list.Pass()) { Build(); } diff --git a/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h b/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h index 48ac659..ee38911 100644 --- a/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h +++ b/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h @@ -15,7 +15,7 @@ class LauncherApplicationMenuItemModel : public ui::SimpleMenuModel, public ui::SimpleMenuModel::Delegate { public: explicit LauncherApplicationMenuItemModel( - scoped_ptr<ChromeLauncherAppMenuItems> item_list); + ChromeLauncherAppMenuItems item_list); virtual ~LauncherApplicationMenuItemModel(); // Overridden from ui::SimpleMenuModel::Delegate: diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.h b/chrome/browser/ui/ash/launcher/launcher_item_controller.h index 049e99d..e8474e1 100644 --- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h +++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h @@ -82,7 +82,7 @@ class LauncherItemController { virtual void OnRemoved() = 0; // Called to retrieve the list of running applications. - virtual ChromeLauncherAppMenuItems* GetApplicationList() = 0; + virtual ChromeLauncherAppMenuItems GetApplicationList() = 0; // Helper function to get the ash::LauncherItemType for the item type. ash::LauncherItemType GetLauncherItemType() const; diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc index 2a43c26..90b4203 100644 --- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc @@ -164,14 +164,14 @@ ShellWindowLauncherItemController::GetIconOfIndexedApp(size_t index) { return new gfx::Image(); } -ChromeLauncherAppMenuItems* +ChromeLauncherAppMenuItems ShellWindowLauncherItemController::GetApplicationList() { - ChromeLauncherAppMenuItems* items = new ChromeLauncherAppMenuItems; + ChromeLauncherAppMenuItems items; if (!launcher_controller()->GetPerAppInterface()) { - items->push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL)); + items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL)); for (size_t i = 0; i < shell_window_count(); i++) { gfx::Image* image = GetIconOfIndexedApp(i); - items->push_back(new ChromeLauncherAppMenuItemV2App( + items.push_back(new ChromeLauncherAppMenuItemV2App( GetTitleOfIndexedApp(i), image, app_id(), @@ -180,7 +180,7 @@ ShellWindowLauncherItemController::GetApplicationList() { delete image; } } - return items; + return items.Pass(); } void ShellWindowLauncherItemController::RestoreOrShow( diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h index 9e36caf..a062a34 100644 --- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h +++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h @@ -56,7 +56,7 @@ class ShellWindowLauncherItemController : public LauncherItemController { virtual void LauncherItemChanged( int model_index, const ash::LauncherItem& old_item) OVERRIDE {} - virtual ChromeLauncherAppMenuItems* GetApplicationList() OVERRIDE; + virtual ChromeLauncherAppMenuItems GetApplicationList() OVERRIDE; // Get the number of running applications/incarnations of this. size_t shell_window_count() const { return shell_windows_.size(); } |