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

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

Issue 9618021: Infrastructure to improve app mode stub <-> Chrome main communication. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix review comments. Created 8 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
« no previous file with comments | « chrome/app/chrome_main_app_mode_mac.mm ('k') | chrome/browser/shell_integration.cc » ('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 (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 #ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_ 5 #ifndef CHROME_BROWSER_SHELL_INTEGRATION_H_
6 #define CHROME_BROWSER_SHELL_INTEGRATION_H_ 6 #define CHROME_BROWSER_SHELL_INTEGRATION_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/string16.h" 14 #include "base/string16.h"
15 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
16 #include "third_party/skia/include/core/SkBitmap.h"
17 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
18 17
19 class CommandLine; 18 class CommandLine;
20 19
21 #if defined(USE_X11) 20 #if defined(USE_X11)
22 namespace base { 21 namespace base {
23 class Environment; 22 class Environment;
24 } 23 }
25 #endif 24 #endif
26 25
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 bool create_on_desktop; 85 bool create_on_desktop;
87 bool create_in_applications_menu; 86 bool create_in_applications_menu;
88 87
89 // For Windows, this refers to quick launch bar prior to Win7. In Win7, 88 // For Windows, this refers to quick launch bar prior to Win7. In Win7,
90 // this means "pin to taskbar". For Mac/Linux, this could be used for 89 // this means "pin to taskbar". For Mac/Linux, this could be used for
91 // Mac dock or the gnome/kde application launcher. However, those are not 90 // Mac dock or the gnome/kde application launcher. However, those are not
92 // implemented yet. 91 // implemented yet.
93 bool create_in_quick_launch_bar; 92 bool create_in_quick_launch_bar;
94 }; 93 };
95 94
95 // Data that needs to be passed between the app launcher stub and Chrome.
96 struct AppModeInfo {
97 };
98 static void SetAppModeInfo(const AppModeInfo* info);
99 static const AppModeInfo* AppModeInfo();
100
101 // Is the current instance of Chrome running in App mode.
102 bool IsRunningInAppMode();
103
96 // Set up command line arguments for launching a URL or an app. 104 // Set up command line arguments for launching a URL or an app.
97 // The new command line reuses the current process's user data directory (and 105 // The new command line reuses the current process's user data directory (and
98 // login profile, for ChromeOS). 106 // login profile, for ChromeOS).
99 // If |extension_app_id| is non-empty, the arguments use kAppId=<id>. 107 // If |extension_app_id| is non-empty, the arguments use kAppId=<id>.
100 // Otherwise, kApp=<url> is used. 108 // Otherwise, kApp=<url> is used.
101 static CommandLine CommandLineArgsForLauncher( 109 static CommandLine CommandLineArgsForLauncher(
102 const GURL& url, 110 const GURL& url,
103 const std::string& extension_app_id); 111 const std::string& extension_app_id);
104 112
105 // Set up command line arguments for launching a platform app. 113 // Set up command line arguments for launching a platform app.
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // Set Chrome as the default handler for this protocol. 293 // Set Chrome as the default handler for this protocol.
286 virtual void SetAsDefault() OVERRIDE; 294 virtual void SetAsDefault() OVERRIDE;
287 295
288 std::string protocol_; 296 std::string protocol_;
289 297
290 DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker); 298 DISALLOW_COPY_AND_ASSIGN(DefaultProtocolClientWorker);
291 }; 299 };
292 }; 300 };
293 301
294 #endif // CHROME_BROWSER_SHELL_INTEGRATION_H_ 302 #endif // CHROME_BROWSER_SHELL_INTEGRATION_H_
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_app_mode_mac.mm ('k') | chrome/browser/shell_integration.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698