chrome/browser/dom_ui/file_browse_browsertest.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/dom_ui/file_browse_browsertest.cc

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 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/chromeos/wm_overview_controller.cc ('k') | chrome/browser/dom_ui/ntp_resource_cache.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 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 "base/task.h"	5 #include "base/task.h"

6 #include "base/path_service.h"	6 #include "base/path_service.h"

7 #include "chrome/browser/dom_ui/dom_ui.h"	7 #include "chrome/browser/dom_ui/dom_ui.h"

8 #include "chrome/browser/tab_contents/navigation_controller.h"	8 #include "chrome/browser/tab_contents/navigation_controller.h"

9 #include "chrome/browser/tab_contents/tab_contents.h"	9 #include "chrome/browser/tab_contents/tab_contents.h"

10 #include "chrome/browser/views/html_dialog_view.h"	10 #include "chrome/browser/ui/views/html_dialog_view.h"

11 #include "chrome/common/chrome_paths.h"	11 #include "chrome/common/chrome_paths.h"

12 #include "chrome/common/notification_registrar.h"	12 #include "chrome/common/notification_registrar.h"

13 #include "chrome/common/url_constants.h"	13 #include "chrome/common/url_constants.h"

14 #include "chrome/test/in_process_browser_test.h"	14 #include "chrome/test/in_process_browser_test.h"

15 #include "chrome/test/ui_test_utils.h"	15 #include "chrome/test/ui_test_utils.h"

16 #include "net/test/test_server.h"	16 #include "net/test/test_server.h"

17	17

18 namespace {	18 namespace {

19	19

20 typedef DOMElementProxy::By By;	20 typedef DOMElementProxy::By By;

(...skipping 100 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
121 observer.WaitForFileBrowseLoad();	121 observer.WaitForFileBrowseLoad();

122 DOMUI* file_browser_ui = observer.file_browse_ui();	122 DOMUI* file_browser_ui = observer.file_browse_ui();

123 ASSERT_TRUE(file_browser_ui);	123 ASSERT_TRUE(file_browser_ui);

124	124

125 file_browser_ui->CallJavascriptFunction(L"dialogCancelClick");	125 file_browser_ui->CallJavascriptFunction(L"dialogCancelClick");

126	126

127 observer.WaitForFileBrowseClose();	127 observer.WaitForFileBrowseClose();

128 }	128 }

129	129

130 } // namespace	130 } // namespace

OLD	NEW