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

Side by Side Diff: chrome/browser/dom_ui/options/options_ui.cc

Issue 6513010: WebUI: Get rid of more references to DOMUI in the rest of the directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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/dom_ui/html_dialog_ui.cc ('k') | chrome/browser/dom_ui/web_ui.h » ('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/dom_ui/options/options_ui.h" 5 #include "chrome/browser/dom_ui/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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) { 243 void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) {
244 std::string command_line_string; 244 std::string command_line_string;
245 245
246 #if defined(OS_WIN) 246 #if defined(OS_WIN)
247 std::wstring wstr = CommandLine::ForCurrentProcess()->command_line_string(); 247 std::wstring wstr = CommandLine::ForCurrentProcess()->command_line_string();
248 command_line_string = WideToASCII(wstr); 248 command_line_string = WideToASCII(wstr);
249 #else 249 #else
250 command_line_string = CommandLine::ForCurrentProcess()->command_line_string(); 250 command_line_string = CommandLine::ForCurrentProcess()->command_line_string();
251 #endif 251 #endif
252 252
253 render_view_host->SetDOMUIProperty("commandLineString", command_line_string); 253 render_view_host->SetWebUIProperty("commandLineString", command_line_string);
254 WebUI::RenderViewCreated(render_view_host); 254 WebUI::RenderViewCreated(render_view_host);
255 } 255 }
256 256
257 void OptionsUI::DidBecomeActiveForReusedRenderView() { 257 void OptionsUI::DidBecomeActiveForReusedRenderView() {
258 // When the renderer is re-used (e.g., for back/forward navigation within 258 // When the renderer is re-used (e.g., for back/forward navigation within
259 // options), the handlers are torn down and rebuilt, so are no longer 259 // options), the handlers are torn down and rebuilt, so are no longer
260 // initialized, but the web page's DOM may remain intact, in which case onload 260 // initialized, but the web page's DOM may remain intact, in which case onload
261 // won't fire to initilize the handlers. To make sure initialization always 261 // won't fire to initilize the handlers. To make sure initialization always
262 // happens, call reinitializeCore (which is a no-op unless the DOM was already 262 // happens, call reinitializeCore (which is a no-op unless the DOM was already
263 // initialized). 263 // initialized).
(...skipping 30 matching lines...) Expand all
294 OptionsPageUIHandler* handler_raw) { 294 OptionsPageUIHandler* handler_raw) {
295 scoped_ptr<OptionsPageUIHandler> handler(handler_raw); 295 scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
296 DCHECK(handler.get()); 296 DCHECK(handler.get());
297 // Add only if handler's service is enabled. 297 // Add only if handler's service is enabled.
298 if (handler->IsEnabled()) { 298 if (handler->IsEnabled()) {
299 handler->GetLocalizedValues(localized_strings); 299 handler->GetLocalizedValues(localized_strings);
300 // Add handler to the list and also pass the ownership. 300 // Add handler to the list and also pass the ownership.
301 AddMessageHandler(handler.release()->Attach(this)); 301 AddMessageHandler(handler.release()->Attach(this));
302 } 302 }
303 } 303 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/html_dialog_ui.cc ('k') | chrome/browser/dom_ui/web_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698