diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 14:39:29 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 14:39:29 +0000 |
commit | 0e0d84eb874acd9feaf11e9b853c4af9b1a5389f (patch) | |
tree | 82047a3fb8eb2134482e62a81806bb1c0e2e530b /views/examples | |
parent | fb7306814a3c41cdc723dc3501b37a5f0d33a8c0 (diff) | |
download | chromium_src-0e0d84eb874acd9feaf11e9b853c4af9b1a5389f.zip chromium_src-0e0d84eb874acd9feaf11e9b853c4af9b1a5389f.tar.gz chromium_src-0e0d84eb874acd9feaf11e9b853c4af9b1a5389f.tar.bz2 |
views/examples: Rename ExamplesMain::CreateWindow() to Init().
This should fix the windows build.
CreateWindow conflicts with a win32 function.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7932023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/examples')
-rw-r--r-- | views/examples/examples_main.cc | 4 | ||||
-rw-r--r-- | views/examples/examples_main.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc index c9b9b0d..d917ddb 100644 --- a/views/examples/examples_main.cc +++ b/views/examples/examples_main.cc @@ -49,7 +49,7 @@ ExamplesMain::ExamplesMain() ExamplesMain::~ExamplesMain() {} -void ExamplesMain::CreateWindow() { +void ExamplesMain::Init() { // Creates a window with the tabbed pane for each example, // and a label to print messages from each example. DCHECK(contents_ == NULL) << "Run called more than once."; @@ -193,7 +193,7 @@ int main(int argc, char** argv) { CommandLine::ForCurrentProcess()->HasSwitch("use-pure-views")); examples::ExamplesMain main; - main.CreateWindow(); + main.Init(); views::AcceleratorHandler accelerator_handler; MessageLoopForUI::current()->Run(&accelerator_handler); diff --git a/views/examples/examples_main.h b/views/examples/examples_main.h index 7cee49b..c879f3e 100644 --- a/views/examples/examples_main.h +++ b/views/examples/examples_main.h @@ -28,7 +28,7 @@ class ExamplesMain : public views::WidgetDelegate { virtual ~ExamplesMain(); // Creates all the examples and shows the window. - void CreateWindow(); + void Init(); // Prints a message in the status area, at the bottom of the window. void SetStatus(const std::string& status); |