diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 21:11:36 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 21:11:36 +0000 |
| commit | a85e7ce06cebd2cc0c9422113d9fdc24109b33f9 (patch) | |
| tree | ba122099280d3a009ce4cb646329fc57ffa19349 /ash | |
| parent | b4c1725ee9845e8e64a2665282d08a5b63f92b0e (diff) | |
| download | chromium_src-a85e7ce06cebd2cc0c9422113d9fdc24109b33f9.zip chromium_src-a85e7ce06cebd2cc0c9422113d9fdc24109b33f9.tar.gz chromium_src-a85e7ce06cebd2cc0c9422113d9fdc24109b33f9.tar.bz2 | |
Beginnings of a WebView.
http://crbug.com/105557
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10024081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell/app_list.cc | 2 | ||||
| -rw-r--r-- | ash/shell/window_type_launcher.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index cfe707a9..19f4336 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -92,7 +92,7 @@ class WindowTypeLauncherItem : public ash::AppListItemModel { case EXAMPLES_WINDOW: { #if !defined(OS_MACOSX) views::examples::ShowExamplesWindow( - views::examples::DO_NOTHING_ON_CLOSE); + views::examples::DO_NOTHING_ON_CLOSE, NULL); #endif break; } diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 9935c98..3d96906 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -341,7 +341,8 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender, } #if !defined(OS_MACOSX) else if (sender == examples_button_) { - views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE); + views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE, + NULL); } #endif // !defined(OS_MACOSX) } |