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

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

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Fix struct traits typo. Created 3 years, 7 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/extension_app_window_launcher_item_cont roller.h" 5 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_cont roller.h"
6 6
7 #include "ash/public/cpp/shelf_item_delegate.h" 7 #include "ash/public/cpp/shelf_item_delegate.h"
8 #include "ash/wm/window_state.h" 8 #include "ash/wm/window_state.h"
9 #include "ash/wm/window_state_aura.h" 9 #include "ash/wm/window_state_aura.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
14 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 14 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
15 #include "components/favicon/content/content_favicon_driver.h" 15 #include "components/favicon/content/content_favicon_driver.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "extensions/browser/app_window/app_window.h" 17 #include "extensions/browser/app_window/app_window.h"
18 #include "extensions/browser/app_window/app_window_registry.h" 18 #include "extensions/browser/app_window/app_window_registry.h"
19 #include "extensions/browser/app_window/native_app_window.h" 19 #include "extensions/browser/app_window/native_app_window.h"
20 #include "ui/aura/client/aura_constants.h" 20 #include "ui/aura/client/aura_constants.h"
21 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
22 #include "ui/events/event.h" 22 #include "ui/events/event.h"
23 #include "ui/gfx/image/image.h" 23 #include "ui/gfx/image/image.h"
24 #include "ui/wm/core/window_animations.h" 24 #include "ui/wm/core/window_animations.h"
25 25
26 ExtensionAppWindowLauncherItemController:: 26 ExtensionAppWindowLauncherItemController::
27 ExtensionAppWindowLauncherItemController( 27 ExtensionAppWindowLauncherItemController(const ash::ShelfID& shelf_id)
28 const ash::AppLaunchId& app_launch_id) 28 : AppWindowLauncherItemController(shelf_id) {}
29 : AppWindowLauncherItemController(app_launch_id) {}
30 29
31 ExtensionAppWindowLauncherItemController:: 30 ExtensionAppWindowLauncherItemController::
32 ~ExtensionAppWindowLauncherItemController() {} 31 ~ExtensionAppWindowLauncherItemController() {}
33 32
34 void ExtensionAppWindowLauncherItemController::AddAppWindow( 33 void ExtensionAppWindowLauncherItemController::AddAppWindow(
35 extensions::AppWindow* app_window) { 34 extensions::AppWindow* app_window) {
36 DCHECK(!app_window->window_type_is_panel()); 35 DCHECK(!app_window->window_type_is_panel());
37 AddWindow(app_window->GetBaseWindow()); 36 AddWindow(app_window->GetBaseWindow());
38 } 37 }
39 38
(...skipping 28 matching lines...) Expand all
68 ++window_index; 67 ++window_index;
69 } 68 }
70 return items; 69 return items;
71 } 70 }
72 71
73 void ExtensionAppWindowLauncherItemController::ExecuteCommand( 72 void ExtensionAppWindowLauncherItemController::ExecuteCommand(
74 uint32_t command_id, 73 uint32_t command_id,
75 int32_t event_flags) { 74 int32_t event_flags) {
76 ChromeLauncherController::instance()->ActivateShellApp(app_id(), command_id); 75 ChromeLauncherController::instance()->ActivateShellApp(app_id(), command_id);
77 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698