| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/browser_shortcut_launcher_item_controll
er.h" | 5 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll
er.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
| 10 #include "ash/shelf/shelf_model.h" | 10 #include "ash/shelf/shelf_model.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "chrome/common/extensions/extension_constants.h" | 27 #include "chrome/common/extensions/extension_constants.h" |
| 28 #include "content/public/browser/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
| 29 #include "grit/ash_resources.h" | 29 #include "grit/ash_resources.h" |
| 30 #include "grit/chromium_strings.h" | 30 #include "grit/chromium_strings.h" |
| 31 #include "grit/generated_resources.h" | 31 #include "grit/generated_resources.h" |
| 32 #include "ui/aura/window.h" | 32 #include "ui/aura/window.h" |
| 33 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
| 34 #include "ui/base/resource/resource_bundle.h" | 34 #include "ui/base/resource/resource_bundle.h" |
| 35 #include "ui/events/event.h" | 35 #include "ui/events/event.h" |
| 36 #include "ui/gfx/image/image.h" | 36 #include "ui/gfx/image/image.h" |
| 37 #include "ui/views/corewm/window_animations.h" | 37 #include "ui/wm/core/window_animations.h" |
| 38 | 38 |
| 39 BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController( | 39 BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController( |
| 40 ChromeLauncherController* launcher_controller) | 40 ChromeLauncherController* launcher_controller) |
| 41 : LauncherItemController(TYPE_SHORTCUT, | 41 : LauncherItemController(TYPE_SHORTCUT, |
| 42 extension_misc::kChromeAppId, | 42 extension_misc::kChromeAppId, |
| 43 launcher_controller) { | 43 launcher_controller) { |
| 44 } | 44 } |
| 45 | 45 |
| 46 BrowserShortcutLauncherItemController:: | 46 BrowserShortcutLauncherItemController:: |
| 47 ~BrowserShortcutLauncherItemController() { | 47 ~BrowserShortcutLauncherItemController() { |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 return (browser && | 320 return (browser && |
| 321 launcher_controller()->IsBrowserFromActiveUser(browser) && | 321 launcher_controller()->IsBrowserFromActiveUser(browser) && |
| 322 browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH && | 322 browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH && |
| 323 (browser->is_type_tabbed() || | 323 (browser->is_type_tabbed() || |
| 324 !browser->is_app() || | 324 !browser->is_app() || |
| 325 !browser->is_type_popup() || | 325 !browser->is_type_popup() || |
| 326 launcher_controller()-> | 326 launcher_controller()-> |
| 327 GetShelfIDForAppID(web_app::GetExtensionIdFromApplicationName( | 327 GetShelfIDForAppID(web_app::GetExtensionIdFromApplicationName( |
| 328 browser->app_name())) <= 0)); | 328 browser->app_name())) <= 0)); |
| 329 } | 329 } |
| OLD | NEW |