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

Side by Side Diff: content/renderer/render_view.cc

Issue 6873069: Change the method name from enumerateDirectory to enumerateChosenDirectory in order to match the ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 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 "content/renderer/render_view.h" 5 #include "content/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 else 1538 else
1539 ipc_params.mode = ViewHostMsg_RunFileChooser_Mode::Open; 1539 ipc_params.mode = ViewHostMsg_RunFileChooser_Mode::Open;
1540 ipc_params.title = params.title; 1540 ipc_params.title = params.title;
1541 ipc_params.default_file_name = 1541 ipc_params.default_file_name =
1542 webkit_glue::WebStringToFilePath(params.initialValue); 1542 webkit_glue::WebStringToFilePath(params.initialValue);
1543 ipc_params.accept_types = params.acceptTypes; 1543 ipc_params.accept_types = params.acceptTypes;
1544 1544
1545 return ScheduleFileChooser(ipc_params, chooser_completion); 1545 return ScheduleFileChooser(ipc_params, chooser_completion);
1546 } 1546 }
1547 1547
1548 bool RenderView::enumerateDirectory( 1548 bool RenderView::enumerateChosenDirectory(
1549 const WebString& path, 1549 const WebString& path,
1550 WebFileChooserCompletion* chooser_completion) { 1550 WebFileChooserCompletion* chooser_completion) {
1551 int id = enumeration_completion_id_++; 1551 int id = enumeration_completion_id_++;
1552 enumeration_completions_[id] = chooser_completion; 1552 enumeration_completions_[id] = chooser_completion;
1553 return Send(new ViewHostMsg_EnumerateDirectory( 1553 return Send(new ViewHostMsg_EnumerateDirectory(
1554 routing_id_, 1554 routing_id_,
1555 id, 1555 id,
1556 webkit_glue::WebStringToFilePath(path))); 1556 webkit_glue::WebStringToFilePath(path)));
1557 } 1557 }
1558 1558
(...skipping 2686 matching lines...) Expand 10 before | Expand all | Expand 10 after
4245 const webkit_glue::CustomContextMenuContext& custom_context) { 4245 const webkit_glue::CustomContextMenuContext& custom_context) {
4246 if (custom_context.is_pepper_menu) 4246 if (custom_context.is_pepper_menu)
4247 pepper_delegate_.OnContextMenuClosed(custom_context); 4247 pepper_delegate_.OnContextMenuClosed(custom_context);
4248 else 4248 else
4249 context_menu_node_.reset(); 4249 context_menu_node_.reset();
4250 } 4250 }
4251 4251
4252 void RenderView::OnNetworkStateChanged(bool online) { 4252 void RenderView::OnNetworkStateChanged(bool online) {
4253 WebNetworkStateNotifier::setOnLine(online); 4253 WebNetworkStateNotifier::setOnLine(online);
4254 } 4254 }
OLDNEW
« content/renderer/render_view.h ('K') | « content/renderer/render_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698