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

Side by Side Diff: chrome/common/common_glue.cc

Issue 6672048: Move plugin code to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/plugin/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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/app_switches.h" 5 #include "app/app_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/plugin/npobject_util.h" 13 #include "content/plugin/npobject_util.h"
14 #include "googleurl/src/url_util.h" 14 #include "googleurl/src/url_util.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/base/ui_base_switches.h" 16 #include "ui/base/ui_base_switches.h"
17 #include "webkit/glue/webkit_glue.h" 17 #include "webkit/glue/webkit_glue.h"
18 18
19 namespace webkit_glue { 19 namespace webkit_glue {
20 20
21 bool GetExeDirectory(FilePath* path) { 21 bool GetExeDirectory(FilePath* path) {
22 return PathService::Get(base::DIR_EXE, path); 22 return PathService::Get(base::DIR_EXE, path);
23 } 23 }
(...skipping 17 matching lines...) Expand all
41 (!parsed_command_line.HasSwitch(switches::kRendererProcess) && 41 (!parsed_command_line.HasSwitch(switches::kRendererProcess) &&
42 !parsed_command_line.HasSwitch(switches::kPluginProcess))); 42 !parsed_command_line.HasSwitch(switches::kPluginProcess)));
43 return lang; 43 return lang;
44 } 44 }
45 45
46 string16 GetLocalizedString(int message_id) { 46 string16 GetLocalizedString(int message_id) {
47 return l10n_util::GetStringUTF16(message_id); 47 return l10n_util::GetStringUTF16(message_id);
48 } 48 }
49 49
50 } // namespace webkit_glue 50 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/plugin/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698