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

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

Issue 417063004: Separate Toolkit specific impl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/renderer_context_menu/render_view_context_menu.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/app_window.h" 5 #include "apps/app_window.h"
6 #include "apps/app_window_registry.h" 6 #include "apps/app_window_registry.h"
7 #include "apps/launcher.h" 7 #include "apps/launcher.h"
8 #include "apps/ui/native_app_window.h" 8 #include "apps/ui/native_app_window.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 return menu_model_.GetIndexOfCommandId(command_id) != -1; 78 return menu_model_.GetIndexOfCommandId(command_id) != -1;
79 } 79 }
80 80
81 protected: 81 protected:
82 // RenderViewContextMenu implementation. 82 // RenderViewContextMenu implementation.
83 virtual bool GetAcceleratorForCommandId( 83 virtual bool GetAcceleratorForCommandId(
84 int command_id, 84 int command_id,
85 ui::Accelerator* accelerator) OVERRIDE { 85 ui::Accelerator* accelerator) OVERRIDE {
86 return false; 86 return false;
87 } 87 }
88 virtual void PlatformInit() OVERRIDE {}
89 virtual void PlatformCancel() OVERRIDE {}
90 }; 88 };
91 89
92 // This class keeps track of tabs as they are added to the browser. It will be 90 // This class keeps track of tabs as they are added to the browser. It will be
93 // "done" (i.e. won't block on Wait()) once |observations| tabs have been added. 91 // "done" (i.e. won't block on Wait()) once |observations| tabs have been added.
94 class TabsAddedNotificationObserver 92 class TabsAddedNotificationObserver
95 : public content::WindowedNotificationObserver { 93 : public content::WindowedNotificationObserver {
96 public: 94 public:
97 explicit TabsAddedNotificationObserver(size_t observations) 95 explicit TabsAddedNotificationObserver(size_t observations)
98 : content::WindowedNotificationObserver( 96 : content::WindowedNotificationObserver(
99 chrome::NOTIFICATION_TAB_ADDED, 97 chrome::NOTIFICATION_TAB_ADDED,
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); 1291 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
1294 ASSERT_TRUE(extension); 1292 ASSERT_TRUE(extension);
1295 ASSERT_EQ(extension_id, extension->id()); 1293 ASSERT_EQ(extension_id, extension->id());
1296 1294
1297 ExtensionApiTest::ResultCatcher result_catcher; 1295 ExtensionApiTest::ResultCatcher result_catcher;
1298 EXPECT_TRUE(result_catcher.GetNextResult()); 1296 EXPECT_TRUE(result_catcher.GetNextResult());
1299 } 1297 }
1300 } 1298 }
1301 1299
1302 } // namespace extensions 1300 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_context_menu/render_view_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698