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

Side by Side Diff: apps/app_shim/extension_app_shim_handler_mac.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 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
« no previous file with comments | « apps/app_shim/DEPS ('k') | chrome/browser/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "apps/app_shim/extension_app_shim_handler_mac.h" 5 #include "apps/app_shim/extension_app_shim_handler_mac.h"
6 6
7 #include "apps/app_lifetime_monitor_factory.h" 7 #include "apps/app_lifetime_monitor_factory.h"
8 #include "apps/app_shim/app_shim_host_manager_mac.h" 8 #include "apps/app_shim/app_shim_host_manager_mac.h"
9 #include "apps/app_shim/app_shim_messages.h" 9 #include "apps/app_shim/app_shim_messages.h"
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
11 #include "apps/app_window_registry.h" 11 #include "apps/app_window_registry.h"
12 #include "apps/launcher.h" 12 #include "apps/launcher.h"
13 #include "apps/ui/native_app_window.h" 13 #include "apps/ui/native_app_window.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/chrome_notification_types.h" 17 #include "chrome/browser/chrome_notification_types.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/browser/ui/extensions/extension_enable_flow.h" 20 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
21 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" 21 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
22 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" 22 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h"
23 #include "chrome/browser/web_applications/web_app_mac.h" 23 #include "chrome/browser/web_applications/web_app_mac.h"
24 #include "chrome/common/extensions/extension_constants.h" 24 #include "chrome/common/extensions/extension_constants.h"
25 #include "components/crx_file/id_util.h"
25 #include "content/public/browser/notification_details.h" 26 #include "content/public/browser/notification_details.h"
26 #include "content/public/browser/notification_service.h" 27 #include "content/public/browser/notification_service.h"
27 #include "content/public/browser/notification_source.h" 28 #include "content/public/browser/notification_source.h"
28 #include "extensions/browser/extension_host.h" 29 #include "extensions/browser/extension_host.h"
29 #include "extensions/browser/extension_registry.h" 30 #include "extensions/browser/extension_registry.h"
30 #include "ui/base/cocoa/focus_window_set.h" 31 #include "ui/base/cocoa/focus_window_set.h"
31 32
32 using extensions::ExtensionRegistry; 33 using extensions::ExtensionRegistry;
33 34
34 namespace { 35 namespace {
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 ++it) { 296 ++it) {
296 it->second->OnAppHide(); 297 it->second->OnAppHide();
297 } 298 }
298 } 299 }
299 300
300 void ExtensionAppShimHandler::OnShimLaunch( 301 void ExtensionAppShimHandler::OnShimLaunch(
301 Host* host, 302 Host* host,
302 AppShimLaunchType launch_type, 303 AppShimLaunchType launch_type,
303 const std::vector<base::FilePath>& files) { 304 const std::vector<base::FilePath>& files) {
304 const std::string& app_id = host->GetAppId(); 305 const std::string& app_id = host->GetAppId();
305 DCHECK(extensions::Extension::IdIsValid(app_id)); 306 DCHECK(crx_file::id_util::IdIsValid(app_id));
306 307
307 const base::FilePath& profile_path = host->GetProfilePath(); 308 const base::FilePath& profile_path = host->GetProfilePath();
308 DCHECK(!profile_path.empty()); 309 DCHECK(!profile_path.empty());
309 310
310 if (!delegate_->ProfileExistsForPath(profile_path)) { 311 if (!delegate_->ProfileExistsForPath(profile_path)) {
311 // User may have deleted the profile this shim was originally created for. 312 // User may have deleted the profile this shim was originally created for.
312 // TODO(jackhou): Add some UI for this case and remove the LOG. 313 // TODO(jackhou): Add some UI for this case and remove the LOG.
313 LOG(ERROR) << "Requested directory is not a known profile '" 314 LOG(ERROR) << "Requested directory is not a known profile '"
314 << profile_path.value() << "'."; 315 << profile_path.value() << "'.";
315 host->OnAppLaunchComplete(APP_SHIM_LAUNCH_PROFILE_NOT_FOUND); 316 host->OnAppLaunchComplete(APP_SHIM_LAUNCH_PROFILE_NOT_FOUND);
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 if (hosts_.empty()) 536 if (hosts_.empty())
536 delegate_->MaybeTerminate(); 537 delegate_->MaybeTerminate();
537 } 538 }
538 539
539 void ExtensionAppShimHandler::OnAppStop(Profile* profile, 540 void ExtensionAppShimHandler::OnAppStop(Profile* profile,
540 const std::string& app_id) {} 541 const std::string& app_id) {}
541 542
542 void ExtensionAppShimHandler::OnChromeTerminating() {} 543 void ExtensionAppShimHandler::OnChromeTerminating() {}
543 544
544 } // namespace apps 545 } // namespace apps
OLDNEW
« no previous file with comments | « apps/app_shim/DEPS ('k') | chrome/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698