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

Side by Side Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 518653002: Add the "options_ui" extension manifest field. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build issue? Created 6 years, 3 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/extensions/application_launch.h" 5 #include "chrome/browser/ui/extensions/application_launch.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "apps/launcher.h" 9 #include "apps/launcher.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/ui/browser_commands.h" 22 #include "chrome/browser/ui/browser_commands.h"
23 #include "chrome/browser/ui/browser_finder.h" 23 #include "chrome/browser/ui/browser_finder.h"
24 #include "chrome/browser/ui/browser_tabstrip.h" 24 #include "chrome/browser/ui/browser_tabstrip.h"
25 #include "chrome/browser/ui/browser_window.h" 25 #include "chrome/browser/ui/browser_window.h"
26 #include "chrome/browser/ui/extensions/extension_enable_flow.h" 26 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
27 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" 27 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
28 #include "chrome/browser/ui/tabs/tab_strip_model.h" 28 #include "chrome/browser/ui/tabs/tab_strip_model.h"
29 #include "chrome/browser/web_applications/web_app.h" 29 #include "chrome/browser/web_applications/web_app.h"
30 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
31 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 31 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
32 #include "chrome/common/extensions/manifest_url_handler.h"
33 #include "chrome/common/url_constants.h" 32 #include "chrome/common/url_constants.h"
34 #include "content/public/browser/render_view_host.h" 33 #include "content/public/browser/render_view_host.h"
35 #include "content/public/browser/web_contents.h" 34 #include "content/public/browser/web_contents.h"
36 #include "content/public/common/renderer_preferences.h" 35 #include "content/public/common/renderer_preferences.h"
37 #include "extensions/browser/extension_prefs.h" 36 #include "extensions/browser/extension_prefs.h"
38 #include "extensions/browser/extension_registry.h" 37 #include "extensions/browser/extension_registry.h"
39 #include "extensions/browser/extension_system.h" 38 #include "extensions/browser/extension_system.h"
40 #include "extensions/common/constants.h" 39 #include "extensions/common/constants.h"
41 #include "extensions/common/extension.h" 40 #include "extensions/common/extension.h"
42 #include "extensions/common/features/feature.h" 41 #include "extensions/common/features/feature.h"
43 #include "extensions/common/features/feature_provider.h" 42 #include "extensions/common/features/feature_provider.h"
43 #include "extensions/common/manifest_handlers/options_page_info.h"
44 #include "ui/base/window_open_disposition.h" 44 #include "ui/base/window_open_disposition.h"
45 #include "ui/gfx/rect.h" 45 #include "ui/gfx/rect.h"
46 46
47 #if defined(OS_MACOSX) 47 #if defined(OS_MACOSX)
48 #include "chrome/browser/ui/browser_commands_mac.h" 48 #include "chrome/browser/ui/browser_commands_mac.h"
49 #endif 49 #endif
50 50
51 using content::WebContents; 51 using content::WebContents;
52 using extensions::Extension; 52 using extensions::Extension;
53 using extensions::ExtensionPrefs; 53 using extensions::ExtensionPrefs;
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 if (!override_url.is_empty()) { 449 if (!override_url.is_empty()) {
450 DCHECK(extension->web_extent().MatchesURL(override_url) || 450 DCHECK(extension->web_extent().MatchesURL(override_url) ||
451 override_url.GetOrigin() == extension->url()); 451 override_url.GetOrigin() == extension->url());
452 url = override_url; 452 url = override_url;
453 } else { 453 } else {
454 url = extensions::AppLaunchInfo::GetFullLaunchURL(extension); 454 url = extensions::AppLaunchInfo::GetFullLaunchURL(extension);
455 } 455 }
456 456
457 // For extensions lacking launch urls, determine a reasonable fallback. 457 // For extensions lacking launch urls, determine a reasonable fallback.
458 if (!url.is_valid()) { 458 if (!url.is_valid()) {
459 url = extensions::ManifestURL::GetOptionsPage(extension); 459 url = extensions::OptionsPageInfo::GetOptionsPage(extension);
460 if (!url.is_valid()) 460 if (!url.is_valid())
461 url = GURL(chrome::kChromeUIExtensionsURL); 461 url = GURL(chrome::kChromeUIExtensionsURL);
462 } 462 }
463 463
464 return url; 464 return url;
465 } 465 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698