Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: chrome/browser/apps/app_browsertest.cc

Issue 678653003: Remove Downcasting RVContextMenuBase in ContextMenuDeleagate implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync @toot Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "apps/launcher.h" 5 #include "apps/launcher.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 class PlatformAppContextMenu : public RenderViewContextMenu { 69 class PlatformAppContextMenu : public RenderViewContextMenu {
70 public: 70 public:
71 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host, 71 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host,
72 const content::ContextMenuParams& params) 72 const content::ContextMenuParams& params)
73 : RenderViewContextMenu(render_frame_host, params) {} 73 : RenderViewContextMenu(render_frame_host, params) {}
74 74
75 bool HasCommandWithId(int command_id) { 75 bool HasCommandWithId(int command_id) {
76 return menu_model_.GetIndexOfCommandId(command_id) != -1; 76 return menu_model_.GetIndexOfCommandId(command_id) != -1;
77 } 77 }
78 78
79 // RenderViewContextMenuBase implementation.
80 void CalculateScreenCoordinatesInParams() override {}
81 void Show() override {}
82
79 protected: 83 protected:
80 // RenderViewContextMenu implementation. 84 // RenderViewContextMenu implementation.
81 bool GetAcceleratorForCommandId(int command_id, 85 bool GetAcceleratorForCommandId(int command_id,
82 ui::Accelerator* accelerator) override { 86 ui::Accelerator* accelerator) override {
83 return false; 87 return false;
84 } 88 }
85 }; 89 };
86 90
87 // 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
88 // "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.
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); 1327 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
1324 ASSERT_TRUE(extension); 1328 ASSERT_TRUE(extension);
1325 ASSERT_EQ(extension_id, extension->id()); 1329 ASSERT_EQ(extension_id, extension->id());
1326 1330
1327 ResultCatcher result_catcher; 1331 ResultCatcher result_catcher;
1328 EXPECT_TRUE(result_catcher.GetNextResult()); 1332 EXPECT_TRUE(result_catcher.GetNextResult());
1329 } 1333 }
1330 } 1334 }
1331 1335
1332 } // namespace extensions 1336 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698