OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "apps/launcher.h" | 9 #include "apps/launcher.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 public: | 79 public: |
80 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host, | 80 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host, |
81 const content::ContextMenuParams& params) | 81 const content::ContextMenuParams& params) |
82 : RenderViewContextMenu(render_frame_host, params) {} | 82 : RenderViewContextMenu(render_frame_host, params) {} |
83 | 83 |
84 bool HasCommandWithId(int command_id) { | 84 bool HasCommandWithId(int command_id) { |
85 return menu_model_.GetIndexOfCommandId(command_id) != -1; | 85 return menu_model_.GetIndexOfCommandId(command_id) != -1; |
86 } | 86 } |
87 | 87 |
88 void Show() override {} | 88 void Show() override {} |
89 | |
90 protected: | |
91 // RenderViewContextMenu implementation. | |
92 bool GetAcceleratorForCommandId(int command_id, | |
93 ui::Accelerator* accelerator) const override { | |
94 return false; | |
95 } | |
96 }; | 89 }; |
97 | 90 |
98 // This class keeps track of tabs as they are added to the browser. It will be | 91 // This class keeps track of tabs as they are added to the browser. It will be |
99 // "done" (i.e. won't block on Wait()) once |observations| tabs have been added. | 92 // "done" (i.e. won't block on Wait()) once |observations| tabs have been added. |
100 class TabsAddedNotificationObserver | 93 class TabsAddedNotificationObserver |
101 : public content::WindowedNotificationObserver { | 94 : public content::WindowedNotificationObserver { |
102 public: | 95 public: |
103 explicit TabsAddedNotificationObserver(size_t observations) | 96 explicit TabsAddedNotificationObserver(size_t observations) |
104 : content::WindowedNotificationObserver( | 97 : content::WindowedNotificationObserver( |
105 chrome::NOTIFICATION_TAB_ADDED, | 98 chrome::NOTIFICATION_TAB_ADDED, |
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1389 // https://crbug.com/620194. | 1382 // https://crbug.com/620194. |
1390 #define MAYBE_AppWindowIframe DISABLED_AppWindowIframe | 1383 #define MAYBE_AppWindowIframe DISABLED_AppWindowIframe |
1391 // Sends chrome.test.sendMessage from chrome.app.window.create's callback. | 1384 // Sends chrome.test.sendMessage from chrome.app.window.create's callback. |
1392 // The app window also adds an <iframe> to the page during window.onload. | 1385 // The app window also adds an <iframe> to the page during window.onload. |
1393 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWindowIframe) { | 1386 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWindowIframe) { |
1394 LoadAndLaunchPlatformApp("app_window_send_message", | 1387 LoadAndLaunchPlatformApp("app_window_send_message", |
1395 "APP_WINDOW_CREATE_CALLBACK"); | 1388 "APP_WINDOW_CREATE_CALLBACK"); |
1396 } | 1389 } |
1397 | 1390 |
1398 } // namespace extensions | 1391 } // namespace extensions |
OLD | NEW |