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

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: Review fixes. 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
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h" 75 #include "chrome/browser/ui/webui/options2/chromeos/stats_options_handler2.h"
76 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h" 76 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"
77 #include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_han dler2.h" 77 #include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_han dler2.h"
78 #endif 78 #endif
79 79
80 #if defined(USE_NSS) 80 #if defined(USE_NSS)
81 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" 81 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
82 #endif 82 #endif
83 83
84 using content::RenderViewHost; 84 using content::RenderViewHost;
85 using content::WebContents; 85
86 using content::WebUIMessageHandler; 86 namespace {
87
88 const char kLocalizedStringsFile[] = "strings.js";
89 const char kOptionsBundleJsFile[] = "options_bundle.js";
90
91 } // namespace
87 92
88 namespace options2 { 93 namespace options2 {
89 94
90 static const char kLocalizedStringsFile[] = "strings.js";
91 static const char kOptionsBundleJsFile[] = "options_bundle.js";
92
93 //////////////////////////////////////////////////////////////////////////////// 95 ////////////////////////////////////////////////////////////////////////////////
94 // 96 //
95 // OptionsUIHTMLSource 97 // OptionsUIHTMLSource
96 // 98 //
97 //////////////////////////////////////////////////////////////////////////////// 99 ////////////////////////////////////////////////////////////////////////////////
98 100
99 class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource { 101 class OptionsUIHTMLSource : public ChromeURLDataManager::DataSource {
100 public: 102 public:
101 // The constructor takes over ownership of |localized_strings|. 103 // The constructor takes over ownership of |localized_strings|.
102 explicit OptionsUIHTMLSource(DictionaryValue* localized_strings); 104 explicit OptionsUIHTMLSource(DictionaryValue* localized_strings);
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 342 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
341 #else 343 #else
342 command_line_string = 344 command_line_string =
343 CommandLine::ForCurrentProcess()->GetCommandLineString(); 345 CommandLine::ForCurrentProcess()->GetCommandLineString();
344 #endif 346 #endif
345 347
346 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 348 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
347 } 349 }
348 350
349 } // namespace options2 351 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698