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

Side by Side Diff: chrome/browser/shell_integration.cc

Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_app_id_fix
Patch Set: fix linux unit tests Created 7 years, 2 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/shell_integration.h" 5 #include "chrome/browser/shell_integration.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 21 matching lines...) Expand all
32 } 32 }
33 33
34 ShellIntegration::ShortcutInfo::ShortcutInfo() 34 ShellIntegration::ShortcutInfo::ShortcutInfo()
35 : is_platform_app(false) { 35 : is_platform_app(false) {
36 } 36 }
37 37
38 ShellIntegration::ShortcutInfo::~ShortcutInfo() {} 38 ShellIntegration::ShortcutInfo::~ShortcutInfo() {}
39 39
40 ShellIntegration::ShortcutLocations::ShortcutLocations() 40 ShellIntegration::ShortcutLocations::ShortcutLocations()
41 : on_desktop(false), 41 : on_desktop(false),
42 in_applications_menu(false), 42 in_applications_menu_root(false),
43 in_applications_menu_chrome_subdir(false),
44 in_applications_menu_chrome_apps_subdir(false),
43 in_quick_launch_bar(false), 45 in_quick_launch_bar(false),
44 hidden(false) { 46 hidden(false) {
45 } 47 }
46 48
47 static const struct ShellIntegration::AppModeInfo* gAppModeInfo = NULL; 49 static const struct ShellIntegration::AppModeInfo* gAppModeInfo = NULL;
48 50
49 // static 51 // static
50 void ShellIntegration::SetAppModeInfo(const struct AppModeInfo* info) { 52 void ShellIntegration::SetAppModeInfo(const struct AppModeInfo* info) {
51 gAppModeInfo = info; 53 gAppModeInfo = info;
52 } 54 }
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 case ShellIntegration::SET_DEFAULT_INTERACTIVE: 299 case ShellIntegration::SET_DEFAULT_INTERACTIVE:
298 if (interactive_permitted) { 300 if (interactive_permitted) {
299 result = ShellIntegration::SetAsDefaultProtocolClientInteractive( 301 result = ShellIntegration::SetAsDefaultProtocolClientInteractive(
300 protocol_); 302 protocol_);
301 } 303 }
302 break; 304 break;
303 } 305 }
304 306
305 return result; 307 return result;
306 } 308 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698