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

Side by Side Diff: chrome/browser/ui/webui/options2/options_ui2.cc

Issue 9703039: Extensions: Don't pass the selected unpacked extension path from JS to C++ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/extensions/pack_extension_handler.cc ('k') | no next file » | 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 #include "chrome/browser/ui/webui/options2/options_ui2.h" 5 #include "chrome/browser/ui/webui/options2/options_ui2.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 #if defined(OS_CHROMEOS) && defined(USE_ASH) 80 #if defined(OS_CHROMEOS) && defined(USE_ASH)
81 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle r2.h" 81 #include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handle r2.h"
82 #endif 82 #endif
83 83
84 #if defined(USE_NSS) 84 #if defined(USE_NSS)
85 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" 85 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
86 #endif 86 #endif
87 87
88 using content::RenderViewHost; 88 using content::RenderViewHost;
89 using content::WebContents; 89
90 using content::WebUIMessageHandler; 90 namespace {
91
92 const char kLocalizedStringsFile[] = "strings.js";
93 const char kOptionsBundleJsFile[] = "options_bundle.js";
94
95 } // namespace
91 96
92 namespace options2 { 97 namespace options2 {
93 98
94 static const char kLocalizedStringsFile[] = "strings.js";
95 static const char kOptionsBundleJsFile[] = "options_bundle.js";
96
97 //////////////////////////////////////////////////////////////////////////////// 99 ////////////////////////////////////////////////////////////////////////////////
98 // 100 //
99 // OptionsUIHTMLSource 101 // OptionsUIHTMLSource
100 // 102 //
101 //////////////////////////////////////////////////////////////////////////////// 103 ////////////////////////////////////////////////////////////////////////////////
102 104
103 class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource { 105 class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource {
104 public: 106 public:
105 // The constructor takes over ownership of |localized_strings|. 107 // The constructor takes over ownership of |localized_strings|.
106 explicit OptionsUIHTMLSource(DictionaryValue* localized_strings); 108 explicit OptionsUIHTMLSource(DictionaryValue* localized_strings);
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 393 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
392 #else 394 #else
393 command_line_string = 395 command_line_string =
394 CommandLine::ForCurrentProcess()->GetCommandLineString(); 396 CommandLine::ForCurrentProcess()->GetCommandLineString();
395 #endif 397 #endif
396 398
397 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 399 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
398 } 400 }
399 401
400 } // namespace options2 402 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/pack_extension_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698