| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/views/aura/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile_manager.h" | 7 #include "chrome/browser/profiles/profile_manager.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/views/aura/app_list_window.h" | 9 #include "chrome/browser/ui/views/aura/app_list_window.h" |
| 10 #include "chrome/browser/ui/views/aura/status_area_host_aura.h" | 10 #include "chrome/browser/ui/views/aura/status_area_host_aura.h" |
| 11 #include "chrome/browser/ui/views/frame/browser_view.h" | 11 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 12 #include "grit/theme_resources.h" | |
| 13 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 14 #include "ui/aura_shell/launcher/launcher_types.h" | 13 #include "ui/aura_shell/launcher/launcher_types.h" |
| 15 #include "ui/aura_shell/window_util.h" | 14 #include "ui/aura_shell/window_util.h" |
| 16 | 15 |
| 17 // static | 16 // static |
| 18 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; | 17 ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL; |
| 19 | 18 |
| 20 ChromeShellDelegate::ChromeShellDelegate() { | 19 ChromeShellDelegate::ChromeShellDelegate() { |
| 21 instance_ = this; | 20 instance_ = this; |
| 22 } | 21 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 const aura_shell::LauncherItem& item) { | 69 const aura_shell::LauncherItem& item) { |
| 71 aura_shell::ActivateWindow(item.window); | 70 aura_shell::ActivateWindow(item.window); |
| 72 } | 71 } |
| 73 | 72 |
| 74 bool ChromeShellDelegate::ConfigureLauncherItem( | 73 bool ChromeShellDelegate::ConfigureLauncherItem( |
| 75 aura_shell::LauncherItem* item) { | 74 aura_shell::LauncherItem* item) { |
| 76 BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window); | 75 BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window); |
| 77 return view && | 76 return view && |
| 78 ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type)); | 77 ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type)); |
| 79 } | 78 } |
| 80 | |
| 81 int ChromeShellDelegate::GetResourceIDForNewBrowserWindow() { | |
| 82 return IDR_PRODUCT_LOGO_32; | |
| 83 } | |
| OLD | NEW |