diff options
| author | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 22:55:57 +0000 |
|---|---|---|
| committer | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 22:55:57 +0000 |
| commit | b3981ac694c31fd45c27fb28d13e2445d5f28d20 (patch) | |
| tree | 20b1f95d3ee4f126e62e0b749a54b2976bed0732 /ash/shell | |
| parent | 9415cfcea3ea9916841a3b2e0bd76d4f8318f170 (diff) | |
| download | chromium_src-b3981ac694c31fd45c27fb28d13e2445d5f28d20.zip chromium_src-b3981ac694c31fd45c27fb28d13e2445d5f28d20.tar.gz chromium_src-b3981ac694c31fd45c27fb28d13e2445d5f28d20.tar.bz2 | |
Add a second kind of WebContentsView called BaseFormatView that displays two extra fields. Both the view and the two fields are contrived for the purposes of getting the design right before diving into UI polish/fit.
Notes:
- Notification and WebNotification need to be unified into a single structure. Once WebNotification moves out of ash/, it serves no separate purpose anymore. This work is blocked on that move (see http://codereview.chromium.org/11229022/).
Review URL: https://chromiumcodereview.appspot.com/11196009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
| -rw-r--r-- | ash/shell/window_type_launcher.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 94179a6..cd18e27 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -330,11 +330,13 @@ void WindowTypeLauncher::ButtonPressed(views::Button* sender, } else if (sender == show_web_notification_) { ash::Shell::GetPrimaryRootWindowController()->status_area_widget()-> web_notification_tray()->message_center()->AddNotification( + ui::notifications::NOTIFICATION_TYPE_SIMPLE, "id0", ASCIIToUTF16("Test Shell Web Notification"), ASCIIToUTF16("Notification message body."), ASCIIToUTF16("www.testshell.org"), - "" /* extension id */); + "" /* extension id */, + NULL /* optional_fields */); } #if !defined(OS_MACOSX) else if (sender == examples_button_) { |