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

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
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 return menu_model_.GetIndexOfCommandId(command_id) != -1; 77 return menu_model_.GetIndexOfCommandId(command_id) != -1;
78 } 78 }
79 79
80 protected: 80 protected:
81 // RenderViewContextMenu implementation. 81 // RenderViewContextMenu implementation.
82 virtual bool GetAcceleratorForCommandId( 82 virtual bool GetAcceleratorForCommandId(
83 int command_id, 83 int command_id,
84 ui::Accelerator* accelerator) OVERRIDE { 84 ui::Accelerator* accelerator) OVERRIDE {
85 return false; 85 return false;
86 } 86 }
87 virtual void PlatformInit() OVERRIDE {}
88 virtual void PlatformCancel() OVERRIDE {}
89 }; 87 };
90 88
91 // This class keeps track of tabs as they are added to the browser. It will be 89 // This class keeps track of tabs as they are added to the browser. It will be
92 // "done" (i.e. won't block on Wait()) once |observations| tabs have been added. 90 // "done" (i.e. won't block on Wait()) once |observations| tabs have been added.
93 class TabsAddedNotificationObserver 91 class TabsAddedNotificationObserver
94 : public content::WindowedNotificationObserver { 92 : public content::WindowedNotificationObserver {
95 public: 93 public:
96 explicit TabsAddedNotificationObserver(size_t observations) 94 explicit TabsAddedNotificationObserver(size_t observations)
97 : content::WindowedNotificationObserver( 95 : content::WindowedNotificationObserver(
98 chrome::NOTIFICATION_TAB_ADDED, 96 chrome::NOTIFICATION_TAB_ADDED,
(...skipping 1192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); 1289 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
1292 ASSERT_TRUE(extension); 1290 ASSERT_TRUE(extension);
1293 ASSERT_EQ(extension_id, extension->id()); 1291 ASSERT_EQ(extension_id, extension->id());
1294 1292
1295 ExtensionApiTest::ResultCatcher result_catcher; 1293 ExtensionApiTest::ResultCatcher result_catcher;
1296 EXPECT_TRUE(result_catcher.GetNextResult()); 1294 EXPECT_TRUE(result_catcher.GetNextResult());
1297 } 1295 }
1298 } 1296 }
1299 1297
1300 } // namespace extensions 1298 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698