chrome/browser/geolocation/geolocation_browsertest.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

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/geolocation/geolocation_browsertest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/geolocation/chrome_geolocation_permission_context.cc ('k') | chrome/browser/geolocation/geolocation_infobar_delegate_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 <string>	5 #include <string>

6	6

7 #include "base/compiler_specific.h"	7 #include "base/compiler_specific.h"

8 #include "base/stringprintf.h"	8 #include "base/stringprintf.h"

9 #include "base/strings/string_number_conversions.h"	9 #include "base/strings/string_number_conversions.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "chrome/browser/content_settings/host_content_settings_map.h"	11 #include "chrome/browser/content_settings/host_content_settings_map.h"

12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"	12 #include "chrome/browser/content_settings/tab_specific_content_settings.h"

13 #include "chrome/browser/geolocation/geolocation_settings_state.h"	13 #include "chrome/browser/geolocation/geolocation_settings_state.h"

14 #include "chrome/browser/infobars/confirm_infobar_delegate.h"	14 #include "chrome/browser/infobars/confirm_infobar_delegate.h"

15 #include "chrome/browser/infobars/infobar.h"	15 #include "chrome/browser/infobars/infobar.h"

16 #include "chrome/browser/infobars/infobar_service.h"	16 #include "chrome/browser/infobars/infobar_service.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/ui/browser.h"	18 #include "chrome/browser/ui/browser.h"

19 #include "chrome/browser/ui/browser_commands.h"	19 #include "chrome/browser/ui/browser_commands.h"

20 #include "chrome/browser/ui/tabs/tab_strip_model.h"	20 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 713 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
734 AddGeolocationWatch(false);	734 AddGeolocationWatch(false);

735	735

736 std::string script =	736 std::string script =

737 "window.domAutomationController.send(window.close());";	737 "window.domAutomationController.send(window.close());";

738 bool result =	738 bool result =

739 content::ExecuteScript(	739 content::ExecuteScript(

740 current_browser_->tab_strip_model()->GetActiveWebContents(),	740 current_browser_->tab_strip_model()->GetActiveWebContents(),

741 script);	741 script);

742 EXPECT_EQ(result, true);	742 EXPECT_EQ(result, true);

743 }	743 }

OLD	NEW