chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 494033002: Move AppWindow to extensions

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/webui/options/browser_options_handler.cc

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 3 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/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/browser/ui/webui/options/options_handlers_helper.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 "chrome/browser/ui/webui/options/browser_options_handler.h"	5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "apps/app_window.h"

11 #include "apps/app_window_registry.h"

12 #include "base/bind.h"	10 #include "base/bind.h"

13 #include "base/bind_helpers.h"	11 #include "base/bind_helpers.h"

14 #include "base/command_line.h"	12 #include "base/command_line.h"

15 #include "base/environment.h"	13 #include "base/environment.h"

16 #include "base/memory/singleton.h"	14 #include "base/memory/singleton.h"

17 #include "base/metrics/field_trial.h"	15 #include "base/metrics/field_trial.h"

18 #include "base/metrics/histogram.h"	16 #include "base/metrics/histogram.h"

19 #include "base/path_service.h"	17 #include "base/path_service.h"

20 #include "base/prefs/pref_service.h"	18 #include "base/prefs/pref_service.h"

21 #include "base/prefs/scoped_user_pref_update.h"	19 #include "base/prefs/scoped_user_pref_update.h"

(...skipping 1840 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1862 extension = extensions::GetExtensionOverridingProxy(	1860 extension = extensions::GetExtensionOverridingProxy(

1863 Profile::FromWebUI(web_ui()));	1861 Profile::FromWebUI(web_ui()));

1864 AppendExtensionData("proxy", extension, &extension_controlled);	1862 AppendExtensionData("proxy", extension, &extension_controlled);

1865	1863

1866 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",	1864 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",

1867 extension_controlled);	1865 extension_controlled);

1868 #endif // defined(OS_WIN)	1866 #endif // defined(OS_WIN)

1869 }	1867 }

1870	1868

1871 } // namespace options	1869 } // namespace options

OLD	NEW