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

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

Issue 11742005: Move [Homepage,Options,Update,DevTools]URL out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: Created 7 years, 11 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "chrome/browser/extensions/extension_prefs.h" 9 #include "chrome/browser/extensions/extension_prefs.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/platform_app_launcher.h" 11 #include "chrome/browser/extensions/platform_app_launcher.h"
12 #include "chrome/browser/extensions/tab_helper.h" 12 #include "chrome/browser/extensions/tab_helper.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_commands.h" 15 #include "chrome/browser/ui/browser_commands.h"
16 #include "chrome/browser/ui/browser_finder.h" 16 #include "chrome/browser/ui/browser_finder.h"
17 #include "chrome/browser/ui/browser_tabstrip.h" 17 #include "chrome/browser/ui/browser_tabstrip.h"
18 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
20 #include "chrome/browser/web_applications/web_app.h" 20 #include "chrome/browser/web_applications/web_app.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
22 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
23 #include "chrome/common/extensions/extension_constants.h" 24 #include "chrome/common/extensions/extension_constants.h"
24 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
25 #include "content/public/browser/render_view_host.h" 26 #include "content/public/browser/render_view_host.h"
26 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
27 #include "content/public/browser/web_contents_view.h" 28 #include "content/public/browser/web_contents_view.h"
28 #include "content/public/common/renderer_preferences.h" 29 #include "content/public/common/renderer_preferences.h"
29 #include "ui/gfx/rect.h" 30 #include "ui/gfx/rect.h"
30 31
31 #if defined(OS_WIN) 32 #if defined(OS_WIN)
(...skipping 18 matching lines...) Expand all
50 if (!override_url.is_empty()) { 51 if (!override_url.is_empty()) {
51 DCHECK(extension->web_extent().MatchesURL(override_url) || 52 DCHECK(extension->web_extent().MatchesURL(override_url) ||
52 override_url.GetOrigin() == extension->url()); 53 override_url.GetOrigin() == extension->url());
53 url = override_url; 54 url = override_url;
54 } else { 55 } else {
55 url = extension->GetFullLaunchURL(); 56 url = extension->GetFullLaunchURL();
56 } 57 }
57 58
58 // For extensions lacking launch urls, determine a reasonable fallback. 59 // For extensions lacking launch urls, determine a reasonable fallback.
59 if (!url.is_valid()) { 60 if (!url.is_valid()) {
60 url = extension->options_url(); 61 url = extensions::ExtensionURL::GetOptionsURL(extension);
61 if (!url.is_valid()) 62 if (!url.is_valid())
62 url = GURL(chrome::kChromeUIExtensionsURL); 63 url = GURL(chrome::kChromeUIExtensionsURL);
63 } 64 }
64 65
65 return url; 66 return url;
66 } 67 }
67 68
68 WebContents* OpenApplicationWindow( 69 WebContents* OpenApplicationWindow(
69 Profile* profile, 70 Profile* profile,
70 const Extension* extension, 71 const Extension* extension,
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 // OnDidGetApplicationInfo, which calls 301 // OnDidGetApplicationInfo, which calls
301 // web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as 302 // web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as
302 // pending web app action. 303 // pending web app action.
303 extensions::TabHelper::FromWebContents(tab)->set_pending_web_app_action( 304 extensions::TabHelper::FromWebContents(tab)->set_pending_web_app_action(
304 extensions::TabHelper::UPDATE_SHORTCUT); 305 extensions::TabHelper::UPDATE_SHORTCUT);
305 306
306 return tab; 307 return tab;
307 } 308 }
308 309
309 } // namespace application_launch 310 } // namespace application_launch
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698