summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.h
diff options
context:
space:
mode:
authorchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 22:32:06 +0000
committerchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-26 22:32:06 +0000
commit5dcbc02fef541561a2ff97a73e231fe751e05829 (patch)
tree7b409ff83b05bd599de7b84bc367391853348e15 /chrome/browser/browser.h
parent67afac662aa2d527a5993fa9eaf5b8f52ebe73e1 (diff)
downloadchromium_src-5dcbc02fef541561a2ff97a73e231fe751e05829.zip
chromium_src-5dcbc02fef541561a2ff97a73e231fe751e05829.tar.gz
chromium_src-5dcbc02fef541561a2ff97a73e231fe751e05829.tar.bz2
Split chromeos options page into system and internet.
BUG=None TEST=None Review URL: http://codereview.chromium.org/548152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
-rw-r--r--chrome/browser/browser.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index e43db31..cea9389 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -432,7 +432,8 @@ class Browser : public TabStripModelDelegate,
// Used by the "Get themes" link in the options dialog.
void OpenThemeGalleryTabAndActivate();
#if defined(OS_CHROMEOS)
- void ShowControlPanel();
+ void OpenSystemOptionsDialog();
+ void OpenInternetOptionsDialog();
#endif
virtual void UpdateDownloadShelfVisibility(bool visible);
@@ -806,7 +807,7 @@ class Browser : public TabStripModelDelegate,
// UI update coalescing and handling ////////////////////////////////////////
- typedef std::map<const TabContents*,int> UpdateMap;
+ typedef std::map<const TabContents*, int> UpdateMap;
// Maps from TabContents to pending UI updates that need to be processed.
// We don't update things like the URL or tab title right away to avoid