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

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

Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deps Created 8 years, 5 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 | Annotate | Revision Log
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/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"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/extension_tab_helper.h" 12 #include "chrome/browser/extensions/extension_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/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
17 #include "chrome/browser/ui/tab_contents/tab_contents.h" 17 #include "chrome/browser/ui/tab_contents/tab_contents.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" 19 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
20 #include "chrome/browser/web_applications/web_app.h" 20 #include "chrome/browser/web_applications/web_app.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "grit/ui_resources.h" 22 #include "grit/ui_resources_standard.h"
23 #include "ui/aura/client/aura_constants.h" 23 #include "ui/aura/client/aura_constants.h"
24 #include "ui/aura/window.h" 24 #include "ui/aura/window.h"
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 26
27 using extensions::Extension; 27 using extensions::Extension;
28 28
29 BrowserLauncherItemController::BrowserLauncherItemController( 29 BrowserLauncherItemController::BrowserLauncherItemController(
30 aura::Window* window, 30 aura::Window* window,
31 TabStripModel* tab_model, 31 TabStripModel* tab_model,
32 ChromeLauncherController* launcher_controller, 32 ChromeLauncherController* launcher_controller,
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 app_state = ChromeLauncherController::APP_STATE_ACTIVE; 250 app_state = ChromeLauncherController::APP_STATE_ACTIVE;
251 } else { 251 } else {
252 app_state = ChromeLauncherController::APP_STATE_INACTIVE; 252 app_state = ChromeLauncherController::APP_STATE_INACTIVE;
253 } 253 }
254 launcher_controller_->UpdateAppState(tab, app_state); 254 launcher_controller_->UpdateAppState(tab, app_state);
255 } 255 }
256 256
257 ash::LauncherModel* BrowserLauncherItemController::launcher_model() { 257 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
258 return launcher_controller_->model(); 258 return launcher_controller_->model();
259 } 259 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search_engines/template_url_table_model.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698