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

Side by Side Diff: chrome/browser/ui/webui/options/options_ui.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
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/options/options_ui.h" 5 #include "chrome/browser/ui/webui/options/options_ui.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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 77 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
78 #include "chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_hand ler.h" 78 #include "chrome/browser/ui/webui/options/chromeos/virtual_keyboard_manager_hand ler.h"
79 #endif 79 #endif
80 80
81 #if defined(USE_NSS) 81 #if defined(USE_NSS)
82 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h" 82 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
83 #endif 83 #endif
84 84
85 using content::UserMetricsAction; 85 using content::UserMetricsAction;
86 using content::WebContents; 86 using content::WebContents;
87 using content::WebUIMessageHandler;
87 88
88 static const char kLocalizedStringsFile[] = "strings.js"; 89 static const char kLocalizedStringsFile[] = "strings.js";
89 static const char kOptionsBundleJsFile[] = "options_bundle.js"; 90 static const char kOptionsBundleJsFile[] = "options_bundle.js";
90 91
91 //////////////////////////////////////////////////////////////////////////////// 92 ////////////////////////////////////////////////////////////////////////////////
92 // 93 //
93 // OptionsUIHTMLSource 94 // OptionsUIHTMLSource
94 // 95 //
95 //////////////////////////////////////////////////////////////////////////////// 96 ////////////////////////////////////////////////////////////////////////////////
96 97
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 #if defined(OS_WIN) 364 #if defined(OS_WIN)
364 command_line_string = 365 command_line_string =
365 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString()); 366 WideToASCII(CommandLine::ForCurrentProcess()->GetCommandLineString());
366 #else 367 #else
367 command_line_string = 368 command_line_string =
368 CommandLine::ForCurrentProcess()->GetCommandLineString(); 369 CommandLine::ForCurrentProcess()->GetCommandLineString();
369 #endif 370 #endif
370 371
371 render_view_host->SetWebUIProperty("commandLineString", command_line_string); 372 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
372 } 373 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.h ('k') | chrome/browser/ui/webui/options2/options_ui2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698