| OLD | NEW |
| 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/views/ash/launcher/browser_launcher_item_controller.
h" | 5 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.
h" |
| 6 | 6 |
| 7 #include "ash/launcher/launcher.h" | 7 #include "ash/launcher/launcher.h" |
| 8 #include "ash/launcher/launcher_model.h" | 8 #include "ash/launcher/launcher_model.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 type = TYPE_APP_PANEL; | 84 type = TYPE_APP_PANEL; |
| 85 } else { | 85 } else { |
| 86 type = TYPE_TABBED; | 86 type = TYPE_TABBED; |
| 87 } | 87 } |
| 88 app_id = web_app::GetExtensionIdFromApplicationName(browser->app_name()); | 88 app_id = web_app::GetExtensionIdFromApplicationName(browser->app_name()); |
| 89 } else { | 89 } else { |
| 90 return NULL; | 90 return NULL; |
| 91 } | 91 } |
| 92 BrowserLauncherItemController* icon_updater = | 92 BrowserLauncherItemController* icon_updater = |
| 93 new BrowserLauncherItemController( | 93 new BrowserLauncherItemController( |
| 94 browser->window()->GetNativeHandle(), browser->tab_strip_model(), | 94 browser->window()->GetNativeWindow(), browser->tab_strip_model(), |
| 95 ChromeLauncherController::instance(), type, app_id); | 95 ChromeLauncherController::instance(), type, app_id); |
| 96 icon_updater->Init(); | 96 icon_updater->Init(); |
| 97 return icon_updater; | 97 return icon_updater; |
| 98 } | 98 } |
| 99 | 99 |
| 100 void BrowserLauncherItemController::BrowserActivationStateChanged() { | 100 void BrowserLauncherItemController::BrowserActivationStateChanged() { |
| 101 UpdateItemStatus(); | 101 UpdateItemStatus(); |
| 102 } | 102 } |
| 103 | 103 |
| 104 void BrowserLauncherItemController::ActiveTabChanged( | 104 void BrowserLauncherItemController::ActiveTabChanged( |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 } else { | 200 } else { |
| 201 item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); | 201 item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); |
| 202 } | 202 } |
| 203 } | 203 } |
| 204 launcher_model()->Set(item_index, item); | 204 launcher_model()->Set(item_index, item); |
| 205 } | 205 } |
| 206 | 206 |
| 207 ash::LauncherModel* BrowserLauncherItemController::launcher_model() { | 207 ash::LauncherModel* BrowserLauncherItemController::launcher_model() { |
| 208 return launcher_controller_->model(); | 208 return launcher_controller_->model(); |
| 209 } | 209 } |
| OLD | NEW |