chrome/browser/views/options/options_window_view.cc - Issue 3066014: Cleanup: Remove unneeded headers from app/ (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/views/options/options_window_view.cc

Issue 3066014: Cleanup: Remove unneeded headers from app/ (part 2) (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: rebase Created 10 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/views/options/fonts_page_view.cc ('k') | chrome/browser/views/shell_dialogs_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/options_window.h"	5 #include "chrome/browser/options_window.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "app/resource_bundle.h"

9 #include "chrome/browser/browser_list.h"	8 #include "chrome/browser/browser_list.h"

10 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

11 #include "chrome/browser/browser_window.h"	10 #include "chrome/browser/browser_window.h"

12 #include "chrome/browser/pref_service.h"	11 #include "chrome/browser/pref_service.h"

13 #include "chrome/browser/profile.h"	12 #include "chrome/browser/profile.h"

14 #include "chrome/browser/views/options/advanced_page_view.h"	13 #include "chrome/browser/views/options/advanced_page_view.h"

15 #include "chrome/browser/views/options/content_page_view.h"	14 #include "chrome/browser/views/options/content_page_view.h"

16 #include "chrome/browser/views/options/general_page_view.h"	15 #include "chrome/browser/views/options/general_page_view.h"

17 #include "chrome/browser/window_sizer.h"	16 #include "chrome/browser/window_sizer.h"

18 #include "chrome/common/chrome_constants.h"	17 #include "chrome/common/chrome_constants.h"

(...skipping 221 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
240 // If there's already an existing options window, activate it and switch to	239 // If there's already an existing options window, activate it and switch to

241 // the specified page.	240 // the specified page.

242 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care	241 // TODO(beng): note this is not multi-simultaneous-profile-safe. When we care

243 // about this case this will have to be fixed.	242 // about this case this will have to be fixed.

244 if (!instance_) {	243 if (!instance_) {

245 instance_ = new OptionsWindowView(profile);	244 instance_ = new OptionsWindowView(profile);

246 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);	245 views::Window::CreateChromeWindow(NULL, gfx::Rect(), instance_);

247 }	246 }

248 instance_->ShowOptionsPage(page, highlight_group);	247 instance_->ShowOptionsPage(page, highlight_group);

249 }	248 }

OLD	NEW