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

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

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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/ash/launcher/chrome_launcher_controller_per_browser. h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser. h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/launcher/launcher_model.h" 9 #include "ash/launcher/launcher_model.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/ui/browser_window.h" 36 #include "chrome/browser/ui/browser_window.h"
37 #include "chrome/browser/ui/extensions/application_launch.h" 37 #include "chrome/browser/ui/extensions/application_launch.h"
38 #include "chrome/browser/ui/extensions/extension_enable_flow.h" 38 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
39 #include "chrome/browser/ui/host_desktop.h" 39 #include "chrome/browser/ui/host_desktop.h"
40 #include "chrome/browser/ui/tabs/tab_strip_model.h" 40 #include "chrome/browser/ui/tabs/tab_strip_model.h"
41 #include "chrome/browser/web_applications/web_app.h" 41 #include "chrome/browser/web_applications/web_app.h"
42 #include "chrome/common/chrome_notification_types.h" 42 #include "chrome/common/chrome_notification_types.h"
43 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
44 #include "chrome/common/extensions/api/icons/icons_handler.h" 44 #include "chrome/common/extensions/api/icons/icons_handler.h"
45 #include "chrome/common/extensions/extension.h" 45 #include "chrome/common/extensions/extension.h"
46 #include "chrome/common/extensions/extension_resource.h"
47 #include "chrome/common/pref_names.h" 46 #include "chrome/common/pref_names.h"
48 #include "chrome/common/url_constants.h" 47 #include "chrome/common/url_constants.h"
49 #include "content/public/browser/navigation_entry.h" 48 #include "content/public/browser/navigation_entry.h"
50 #include "content/public/browser/notification_service.h" 49 #include "content/public/browser/notification_service.h"
51 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
52 #include "extensions/common/url_pattern.h" 51 #include "extensions/common/url_pattern.h"
53 #include "grit/theme_resources.h" 52 #include "grit/theme_resources.h"
54 #include "ui/aura/root_window.h" 53 #include "ui/aura/root_window.h"
55 #include "ui/aura/window.h" 54 #include "ui/aura/window.h"
56 55
(...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 void ChromeLauncherControllerPerBrowser::SetAppIconLoaderForTest( 1325 void ChromeLauncherControllerPerBrowser::SetAppIconLoaderForTest(
1327 extensions::AppIconLoader* loader) { 1326 extensions::AppIconLoader* loader) {
1328 app_icon_loader_.reset(loader); 1327 app_icon_loader_.reset(loader);
1329 } 1328 }
1330 1329
1331 const std::string& 1330 const std::string&
1332 ChromeLauncherControllerPerBrowser::GetAppIdFromLauncherIdForTest( 1331 ChromeLauncherControllerPerBrowser::GetAppIdFromLauncherIdForTest(
1333 ash::LauncherID id) { 1332 ash::LauncherID id) {
1334 return id_to_item_controller_map_[id]->app_id(); 1333 return id_to_item_controller_map_[id]->app_id();
1335 } 1334 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698