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

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

Issue 10828151: chrome: Copy app_list files from views/ to ash/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/launcher/launcher_model.h" 10 #include "ash/launcher/launcher_model.h"
11 #include "ash/launcher/launcher_types.h" 11 #include "ash/launcher/launcher_types.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/wm/window_util.h" 13 #include "ash/wm/window_util.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/defaults.h" 17 #include "chrome/browser/defaults.h"
18 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
19 #include "chrome/browser/prefs/incognito_mode_prefs.h" 19 #include "chrome/browser/prefs/incognito_mode_prefs.h"
20 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/prefs/scoped_user_pref_update.h" 21 #include "chrome/browser/prefs/scoped_user_pref_update.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/profiles/profile_manager.h" 23 #include "chrome/browser/profiles/profile_manager.h"
24 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 24 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
25 #include "chrome/browser/ui/ash/extension_utils.h"
25 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_commands.h" 27 #include "chrome/browser/ui/browser_commands.h"
27 #include "chrome/browser/ui/browser_finder.h" 28 #include "chrome/browser/ui/browser_finder.h"
28 #include "chrome/browser/ui/browser_window.h" 29 #include "chrome/browser/ui/browser_window.h"
29 #include "chrome/browser/ui/extensions/shell_window.h" 30 #include "chrome/browser/ui/extensions/shell_window.h"
30 #include "chrome/browser/ui/tab_contents/tab_contents.h" 31 #include "chrome/browser/ui/tab_contents/tab_contents.h"
31 #include "chrome/browser/ui/tabs/tab_strip_model.h" 32 #include "chrome/browser/ui/tabs/tab_strip_model.h"
32 #include "chrome/browser/ui/views/ash/extension_utils.h"
33 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h" 33 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h"
34 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h" 34 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h"
35 #include "chrome/browser/ui/views/ash/launcher/launcher_app_tab_helper.h" 35 #include "chrome/browser/ui/views/ash/launcher/launcher_app_tab_helper.h"
36 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h" 36 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"
37 #include "chrome/browser/web_applications/web_app.h" 37 #include "chrome/browser/web_applications/web_app.h"
38 #include "chrome/common/chrome_notification_types.h" 38 #include "chrome/common/chrome_notification_types.h"
39 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
40 #include "chrome/common/extensions/extension.h" 40 #include "chrome/common/extensions/extension.h"
41 #include "chrome/common/extensions/extension_resource.h" 41 #include "chrome/common/extensions/extension_resource.h"
42 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 } 987 }
988 model_->AddAt(index, item); 988 model_->AddAt(index, item);
989 989
990 if (!controller || controller->type() != 990 if (!controller || controller->type() !=
991 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) { 991 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) {
992 if (item.status != ash::STATUS_IS_PENDING) 992 if (item.status != ash::STATUS_IS_PENDING)
993 app_icon_loader_->FetchImage(app_id); 993 app_icon_loader_->FetchImage(app_id);
994 } 994 }
995 return id; 995 return id;
996 } 996 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698