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

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: remove virtual keyword when override is specified 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 class PlatformAppContextMenu : public RenderViewContextMenu { 68 class PlatformAppContextMenu : public RenderViewContextMenu {
69 public: 69 public:
70 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host, 70 PlatformAppContextMenu(content::RenderFrameHost* render_frame_host,
71 const content::ContextMenuParams& params) 71 const content::ContextMenuParams& params)
72 : RenderViewContextMenu(render_frame_host, params) {} 72 : RenderViewContextMenu(render_frame_host, params) {}
73 73
74 bool HasCommandWithId(int command_id) { 74 bool HasCommandWithId(int command_id) {
75 return menu_model_.GetIndexOfCommandId(command_id) != -1; 75 return menu_model_.GetIndexOfCommandId(command_id) != -1;
76 } 76 }
77 77
78 void Show() override {}
79
78 protected: 80 protected:
79 // RenderViewContextMenu implementation. 81 // RenderViewContextMenu implementation.
80 bool GetAcceleratorForCommandId(int command_id, 82 bool GetAcceleratorForCommandId(int command_id,
81 ui::Accelerator* accelerator) override { 83 ui::Accelerator* accelerator) override {
82 return false; 84 return false;
83 } 85 }
84 }; 86 };
85 87
86 // This class keeps track of tabs as they are added to the browser. It will be 88 // This class keeps track of tabs as they are added to the browser. It will be
87 // "done" (i.e. won't block on Wait()) once |observations| tabs have been added. 89 // "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
1322 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); 1324 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
1323 ASSERT_TRUE(extension); 1325 ASSERT_TRUE(extension);
1324 ASSERT_EQ(extension_id, extension->id()); 1326 ASSERT_EQ(extension_id, extension->id());
1325 1327
1326 ResultCatcher result_catcher; 1328 ResultCatcher result_catcher;
1327 EXPECT_TRUE(result_catcher.GetNextResult()); 1329 EXPECT_TRUE(result_catcher.GetNextResult());
1328 } 1330 }
1329 } 1331 }
1330 1332
1331 } // namespace extensions 1333 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698