views/examples: Rename ShowExamplesWindow() to ShowExamplesWindowWithContent().

views/examples: Rename ShowExamplesWindow() to ShowExamplesWindowWithContent().

That way we will be able to have another function called just ShowExamplesWindow,
that does not take a type from content/ package.

BUG=141187
TBR=ben@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=152901

[tfarina, 2012-08-22 01:10:25]

TBRing...

[Ben Goodger (Google), 2012-08-22 16:01:42]

LGTM


On Tue, Aug 21, 2012 at 6:10 PM, <tfarina@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Message:
> TBRing...
>
> Description:
> views/examples: Rename ShowExamplesWindow() to
> ShowExamplesWindowWithContent(**).
>
> That way we will be able to have another function called just
> ShowExamplesWindow,
> that does not take a type from content/ package.
>
> BUG=141187
> TBR=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/10869007/<http://codereview.chromium.org/108...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M ash/shell/app_list.cc
>   M ash/shell/window_type_**launcher.cc
>   M ui/views/examples/content_**client/examples_browser_main_**parts.cc
>   M ui/views/examples/examples_**window_with_content.h
>   M ui/views/examples/examples_**window_with_content.cc
>
>
> Index: ash/shell/app_list.cc
> diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
> index a44d3973efe20c386bf77bf53664b1**9d2d0387aa..**
> 40215ae934af14a8b46e13d087f4f2**b0252217a8 100644
> --- a/ash/shell/app_list.cc
> +++ b/ash/shell/app_list.cc
> @@ -117,7 +117,7 @@ class WindowTypeLauncherItem : public
> app_list::AppListItemModel {
>        }
>        case EXAMPLES_WINDOW: {
>  #if !defined(OS_MACOSX)
> -        views::examples::**ShowExamplesWindow(
> +        views::examples::**ShowExamplesWindowWithContent(
>              views::examples::DO_NOTHING_**ON_CLOSE,
>              ash::Shell::GetInstance()->**browser_context());
>  #endif
> Index: ash/shell/window_type_**launcher.cc
> diff --git a/ash/shell/window_type_**launcher.cc b/ash/shell/window_type_*
> *launcher.cc
> index 5c40caaa4ccc976aac6859af7e06be**50f125b950..**
> c9032db1ce3cf0bedd3da7cfccdc4e**28b9bbef32 100644
> --- a/ash/shell/window_type_**launcher.cc
> +++ b/ash/shell/window_type_**launcher.cc
> @@ -337,7 +337,7 @@ void WindowTypeLauncher::**ButtonPressed(views::Button*
> sender,
>    }
>  #if !defined(OS_MACOSX)
>    else if (sender == examples_button_) {
> -    views::examples::**ShowExamplesWindow(
> +    views::examples::**ShowExamplesWindowWithContent(
>          views::examples::DO_NOTHING_**ON_CLOSE,
>          ash::Shell::GetInstance()->**browser_context());
>    }
> Index: ui/views/examples/content_**client/examples_browser_main_**parts.cc
> diff --git
a/ui/views/examples/content_**client/examples_browser_main_**parts.cc
> b/ui/views/examples/content_**client/examples_browser_main_**parts.cc
> index b9b16cd22636196091cd5796edc353**5db7bbdaef..**
> a21c9c162efc7a84f019689c83c77e**f2841e4b70 100644
> --- a/ui/views/examples/content_**client/examples_browser_main_**parts.cc
> +++ b/ui/views/examples/content_**client/examples_browser_main_**parts.cc
> @@ -62,7 +62,7 @@ void ExamplesBrowserMainParts::**PreMainMessageLoopRun()
> {
>  #endif
>    views_delegate_.reset(new ExamplesViewsDelegate);
>
> -  ShowExamplesWindow(QUIT_ON_**CLOSE, browser_context_.get());
> +  ShowExamplesWindowWithContent(**QUIT_ON_CLOSE, browser_context_.get());
>  }
>
>  void ExamplesBrowserMainParts::**PostMainMessageLoopRun() {
> Index: ui/views/examples/examples_**window_with_content.cc
> diff --git a/ui/views/examples/examples_**window_with_content.cc
> b/ui/views/examples/examples_**window_with_content.cc
> index d71f631d8e5e476e6777f0ceedecc5**b775f033a3..**
> 8c6a7e25ae834c47defe330e57002f**2f7b819a08 100644
> --- a/ui/views/examples/examples_**window_with_content.cc
> +++ b/ui/views/examples/examples_**window_with_content.cc
> @@ -197,8 +197,8 @@ ExamplesWindowContents(**Operation operation,
>  // static
>  ExamplesWindowContents* ExamplesWindowContents::**instance_ = NULL;
>
> -void ShowExamplesWindow(Operation operation,
> -                        content::BrowserContext* browser_context) {
> +void ShowExamplesWindowWithContent(**Operation operation,
> +                                   content::BrowserContext*
> browser_context) {
>    if (ExamplesWindowContents::**instance()) {
>      ExamplesWindowContents::**instance()->GetWidget()->**Activate();
>    } else {
> Index: ui/views/examples/examples_**window_with_content.h
> diff --git a/ui/views/examples/examples_**window_with_content.h
> b/ui/views/examples/examples_**window_with_content.h
> index 371c64dbe8dbcfebcfd0c75dd539f8**8d2cef1d72..**
> 6e67b31294aae328b6d492bd2b3bdd**9eb96b96df 100644
> --- a/ui/views/examples/examples_**window_with_content.h
> +++ b/ui/views/examples/examples_**window_with_content.h
> @@ -20,7 +20,7 @@ enum Operation {
>  };
>
>  // Shows a window with the views examples in it.
> -VIEWS_EXAMPLES_EXPORT void ShowExamplesWindow(
> +VIEWS_EXAMPLES_EXPORT void ShowExamplesWindowWithContent(
>      Operation operation,
>      content::BrowserContext* browser_context);
>
>
>
>