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

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

Issue 13460012: Move IconsHandler from c/c/e/api/ to c/c/e (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for CQ Created 7 years, 8 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/browser_launcher_item_controller.h" 5 #include "chrome/browser/ui/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"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/tab_helper.h" 12 #include "chrome/browser/extensions/tab_helper.h"
13 #include "chrome/browser/favicon/favicon_tab_helper.h" 13 #include "chrome/browser/favicon/favicon_tab_helper.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h" 15 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_list.h" 18 #include "chrome/browser/ui/browser_list.h"
19 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/browser/web_applications/web_app.h" 21 #include "chrome/browser/web_applications/web_app.h"
22 #include "chrome/common/extensions/api/icons/icons_handler.h" 22 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "grit/ui_resources.h" 24 #include "grit/ui_resources.h"
25 #include "ui/aura/client/aura_constants.h" 25 #include "ui/aura/client/aura_constants.h"
26 #include "ui/aura/window.h" 26 #include "ui/aura/window.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
29 29
30 using extensions::Extension;
31
32 BrowserLauncherItemController::BrowserLauncherItemController( 30 BrowserLauncherItemController::BrowserLauncherItemController(
33 Type type, 31 Type type,
34 aura::Window* window, 32 aura::Window* window,
35 TabStripModel* tab_model, 33 TabStripModel* tab_model,
36 ChromeLauncherController* launcher_controller, 34 ChromeLauncherController* launcher_controller,
37 const std::string& app_id) 35 const std::string& app_id)
38 : LauncherItemController(type, app_id, launcher_controller), 36 : LauncherItemController(type, app_id, launcher_controller),
39 window_(window), 37 window_(window),
40 tab_model_(tab_model), 38 tab_model_(tab_model),
41 is_incognito_(tab_model->profile()->GetOriginalProfile() != 39 is_incognito_(tab_model->profile()->GetOriginalProfile() !=
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 app_state = ChromeLauncherController::APP_STATE_ACTIVE; 316 app_state = ChromeLauncherController::APP_STATE_ACTIVE;
319 } else { 317 } else {
320 app_state = ChromeLauncherController::APP_STATE_INACTIVE; 318 app_state = ChromeLauncherController::APP_STATE_INACTIVE;
321 } 319 }
322 launcher_controller()->UpdateAppState(tab, app_state); 320 launcher_controller()->UpdateAppState(tab, app_state);
323 } 321 }
324 322
325 ash::LauncherModel* BrowserLauncherItemController::launcher_model() { 323 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
326 return launcher_controller()->model(); 324 return launcher_controller()->model();
327 } 325 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/search_builder.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698