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

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
« no previous file with comments | « content/renderer/render_view.h ('k') | no next file » | 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 "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 1360 matching lines...) Expand 10 before | Expand all | Expand 10 after
1371 } 1371 }
1372 1372
1373 void RenderView::printPage(WebFrame* frame) { 1373 void RenderView::printPage(WebFrame* frame) {
1374 FOR_EACH_OBSERVER(RenderViewObserver, observers_, PrintPage(frame)); 1374 FOR_EACH_OBSERVER(RenderViewObserver, observers_, PrintPage(frame));
1375 } 1375 }
1376 1376
1377 WebKit::WebNotificationPresenter* RenderView::notificationPresenter() { 1377 WebKit::WebNotificationPresenter* RenderView::notificationPresenter() {
1378 return notification_provider_; 1378 return notification_provider_;
1379 } 1379 }
1380 1380
1381 bool RenderView::enumerateChosenDirectory(
1382 const WebString& path,
1383 WebFileChooserCompletion* chooser_completion) {
1384 int id = enumeration_completion_id_++;
1385 enumeration_completions_[id] = chooser_completion;
1386 return Send(new ViewHostMsg_EnumerateDirectory(
1387 routing_id_,
1388 id,
1389 webkit_glue::WebStringToFilePath(path)));
1390 }
1391
1381 void RenderView::didStartLoading() { 1392 void RenderView::didStartLoading() {
1382 if (is_loading_) { 1393 if (is_loading_) {
1383 DLOG(WARNING) << "didStartLoading called while loading"; 1394 DLOG(WARNING) << "didStartLoading called while loading";
1384 return; 1395 return;
1385 } 1396 }
1386 1397
1387 is_loading_ = true; 1398 is_loading_ = true;
1388 // Clear the pointer so that we can assign it only when there is an unknown 1399 // Clear the pointer so that we can assign it only when there is an unknown
1389 // plugin on a page. 1400 // plugin on a page.
1390 first_default_plugin_.reset(); 1401 first_default_plugin_.reset();
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 else 1549 else
1539 ipc_params.mode = ViewHostMsg_RunFileChooser_Mode::Open; 1550 ipc_params.mode = ViewHostMsg_RunFileChooser_Mode::Open;
1540 ipc_params.title = params.title; 1551 ipc_params.title = params.title;
1541 ipc_params.default_file_name = 1552 ipc_params.default_file_name =
1542 webkit_glue::WebStringToFilePath(params.initialValue); 1553 webkit_glue::WebStringToFilePath(params.initialValue);
1543 ipc_params.accept_types = params.acceptTypes; 1554 ipc_params.accept_types = params.acceptTypes;
1544 1555
1545 return ScheduleFileChooser(ipc_params, chooser_completion); 1556 return ScheduleFileChooser(ipc_params, chooser_completion);
1546 } 1557 }
1547 1558
1548 bool RenderView::enumerateDirectory(
1549 const WebString& path,
1550 WebFileChooserCompletion* chooser_completion) {
1551 int id = enumeration_completion_id_++;
1552 enumeration_completions_[id] = chooser_completion;
1553 return Send(new ViewHostMsg_EnumerateDirectory(
1554 routing_id_,
1555 id,
1556 webkit_glue::WebStringToFilePath(path)));
1557 }
1558
1559 void RenderView::runModalAlertDialog( 1559 void RenderView::runModalAlertDialog(
1560 WebFrame* frame, const WebString& message) { 1560 WebFrame* frame, const WebString& message) {
1561 RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptAlert, 1561 RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptAlert,
1562 UTF16ToWideHack(message), 1562 UTF16ToWideHack(message),
1563 std::wstring(), 1563 std::wstring(),
1564 frame->url(), 1564 frame->url(),
1565 NULL); 1565 NULL);
1566 } 1566 }
1567 1567
1568 bool RenderView::runModalConfirmDialog( 1568 bool RenderView::runModalConfirmDialog(
(...skipping 2676 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
« no previous file with comments | « content/renderer/render_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698