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

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

Issue 8986007: Move WebUIMessageHandler to its own file in the public directory and put it in the content namesp... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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/options2/options_ui2.h ('k') | chrome/browser/ui/webui/plugins_ui.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "chrome/browser/ui/webui/options2/chromeos/system_options_handler2.h" 73 #include "chrome/browser/ui/webui/options2/chromeos/system_options_handler2.h"
74 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h" 74 #include "chrome/browser/ui/webui/options2/chromeos/user_image_source2.h"
75 #include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_han dler2.h" 75 #include "chrome/browser/ui/webui/options2/chromeos/virtual_keyboard_manager_han dler2.h"
76 #endif 76 #endif
77 77
78 #if defined(USE_NSS) 78 #if defined(USE_NSS)
79 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h" 79 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.h"
80 #endif 80 #endif
81 81
82 using content::WebContents; 82 using content::WebContents;
83 using content::WebUIMessageHandler;
83 84
84 namespace options2 { 85 namespace options2 {
85 86
86 static const char kLocalizedStringsFile[] = "strings.js"; 87 static const char kLocalizedStringsFile[] = "strings.js";
87 static const char kOptionsBundleJsFile[] = "options_bundle.js"; 88 static const char kOptionsBundleJsFile[] = "options_bundle.js";
88 89
89 //////////////////////////////////////////////////////////////////////////////// 90 ////////////////////////////////////////////////////////////////////////////////
90 // 91 //
91 // OptionsUIHTMLSource 92 // OptionsUIHTMLSource
92 // 93 //
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 365 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
365 #else 366 #else
366 command_line_string = 367 command_line_string =
367 CommandLine::ForCurrentProcess()->GetCommandLineString(); 368 CommandLine::ForCurrentProcess()->GetCommandLineString();
368 #endif 369 #endif
369 370
370 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 371 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
371 } 372 }
372 373
373 } // namespace options2 374 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui2.h ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698