chrome/browser/ui/chrome_pages.cc - Issue 10837331: Options: s/options2/options/.

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/ui/chrome_pages.cc

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wut Created 8 years, 4 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/login/wallpaper_manager.h ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

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 "chrome/browser/ui/chrome_pages.h"	5 #include "chrome/browser/ui/chrome_pages.h"

6	6

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

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

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

10 #include "chrome/browser/download/download_shelf.h"	10 #include "chrome/browser/download/download_shelf.h"

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

12 #include "chrome/browser/sync/profile_sync_service.h"	12 #include "chrome/browser/sync/profile_sync_service.h"

13 #include "chrome/browser/sync/profile_sync_service_factory.h"	13 #include "chrome/browser/sync/profile_sync_service_factory.h"

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

15 #include "chrome/browser/ui/browser_navigator.h"	15 #include "chrome/browser/ui/browser_navigator.h"

16 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

17 #include "chrome/browser/ui/singleton_tabs.h"	17 #include "chrome/browser/ui/singleton_tabs.h"

18 #include "chrome/browser/ui/webui/options2/content_settings_handler.h"	18 #include "chrome/browser/ui/webui/options/content_settings_handler.h"

19 #include "chrome/browser/ui/webui/signin/login_ui_service.h"	19 #include "chrome/browser/ui/webui/signin/login_ui_service.h"

20 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"	20 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

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

22 #include "content/public/browser/user_metrics.h"	22 #include "content/public/browser/user_metrics.h"

23	23

24 using content::UserMetricsAction;	24 using content::UserMetricsAction;

25	25

26 namespace chrome {	26 namespace chrome {

27 namespace {	27 namespace {

28	28

(...skipping 155 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
184 NavigateParams params(GetSingletonTabNavigateParams(browser, GURL(url)));	184 NavigateParams params(GetSingletonTabNavigateParams(browser, GURL(url)));

185 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;	185 params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;

186 ShowSingletonTabOverwritingNTP(browser, params);	186 ShowSingletonTabOverwritingNTP(browser, params);

187 } else {	187 } else {

188 LoginUIServiceFactory::GetForProfile(	188 LoginUIServiceFactory::GetForProfile(

189 browser->profile()->GetOriginalProfile())->ShowLoginUI(browser);	189 browser->profile()->GetOriginalProfile())->ShowLoginUI(browser);

190 }	190 }

191 }	191 }

192	192

193 } // namespace chrome	193 } // namespace chrome

OLD	NEW