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

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

Issue 23530020: [cleanup] Remove LauncherItemChanged() from LauncherItemController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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/ui/ash/launcher/app_shortcut_launcher_item_controller.h " 5 #include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h "
6 6
7 #include "apps/native_app_window.h" 7 #include "apps/native_app_window.h"
8 #include "ash/wm/window_util.h" 8 #include "ash/wm/window_util.h"
9 #include "chrome/browser/extensions/extension_process_manager.h" 9 #include "chrome/browser/extensions/extension_process_manager.h"
10 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 return; 138 return;
139 } 139 }
140 Activate(); 140 Activate();
141 } 141 }
142 142
143 void AppShortcutLauncherItemController::OnRemoved() { 143 void AppShortcutLauncherItemController::OnRemoved() {
144 // AppShortcutLauncherItemController is unowned; delete on removal. 144 // AppShortcutLauncherItemController is unowned; delete on removal.
145 delete this; 145 delete this;
146 } 146 }
147 147
148 void AppShortcutLauncherItemController::LauncherItemChanged(
149 int model_index,
150 const ash::LauncherItem& old_item) {
151 }
152
153 ChromeLauncherAppMenuItems 148 ChromeLauncherAppMenuItems
154 AppShortcutLauncherItemController::GetApplicationList(int event_flags) { 149 AppShortcutLauncherItemController::GetApplicationList(int event_flags) {
155 ChromeLauncherAppMenuItems items; 150 ChromeLauncherAppMenuItems items;
156 // Add the application name to the menu. 151 // Add the application name to the menu.
157 items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL, false)); 152 items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL, false));
158 153
159 std::vector<content::WebContents*> content_list = GetRunningApplications(); 154 std::vector<content::WebContents*> content_list = GetRunningApplications();
160 155
161 for (size_t i = 0; i < content_list.size(); i++) { 156 for (size_t i = 0; i < content_list.size(); i++) {
162 content::WebContents* web_contents = content_list[i]; 157 content::WebContents* web_contents = content_list[i];
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 315
321 bool AppShortcutLauncherItemController::AllowNextLaunchAttempt() { 316 bool AppShortcutLauncherItemController::AllowNextLaunchAttempt() {
322 if (last_launch_attempt_.is_null() || 317 if (last_launch_attempt_.is_null() ||
323 last_launch_attempt_ + base::TimeDelta::FromMilliseconds( 318 last_launch_attempt_ + base::TimeDelta::FromMilliseconds(
324 kClickSuppressionInMS) < base::Time::Now()) { 319 kClickSuppressionInMS) < base::Time::Now()) {
325 last_launch_attempt_ = base::Time::Now(); 320 last_launch_attempt_ = base::Time::Now();
326 return true; 321 return true;
327 } 322 }
328 return false; 323 return false;
329 } 324 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698