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

Side by Side Diff: chrome/test/remoting/remote_desktop_browsertest.cc

Issue 425303002: Move extension notifications to extensions/browser/notification_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (extension-notifications) rebase 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 | « chrome/test/base/extension_load_waiter_one_shot.cc ('k') | extensions/DEPS » ('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 "chrome/test/remoting/remote_desktop_browsertest.h" 5 #include "chrome/test/remoting/remote_desktop_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 } 113 }
114 114
115 void RemoteDesktopBrowserTest::InstallChromotingAppUnpacked() { 115 void RemoteDesktopBrowserTest::InstallChromotingAppUnpacked() {
116 ASSERT_TRUE(is_unpacked()); 116 ASSERT_TRUE(is_unpacked());
117 117
118 scoped_refptr<extensions::UnpackedInstaller> installer = 118 scoped_refptr<extensions::UnpackedInstaller> installer =
119 extensions::UnpackedInstaller::Create(extension_service()); 119 extensions::UnpackedInstaller::Create(extension_service());
120 installer->set_prompt_for_plugins(false); 120 installer->set_prompt_for_plugins(false);
121 121
122 content::WindowedNotificationObserver observer( 122 content::WindowedNotificationObserver observer(
123 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, 123 extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
124 content::NotificationService::AllSources()); 124 content::NotificationService::AllSources());
125 125
126 installer->Load(webapp_unpacked_); 126 installer->Load(webapp_unpacked_);
127 127
128 observer.Wait(); 128 observer.Wait();
129 } 129 }
130 130
131 void RemoteDesktopBrowserTest::UninstallChromotingApp() { 131 void RemoteDesktopBrowserTest::UninstallChromotingApp() {
132 UninstallExtension(ChromotingID()); 132 UninstallExtension(ChromotingID());
133 extension_ = NULL; 133 extension_ = NULL;
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 // static 795 // static
796 bool RemoteDesktopBrowserTest::IsHostActionComplete( 796 bool RemoteDesktopBrowserTest::IsHostActionComplete(
797 content::WebContents* client_web_content, 797 content::WebContents* client_web_content,
798 std::string host_action_var) { 798 std::string host_action_var) {
799 return ExecuteScriptAndExtractBool( 799 return ExecuteScriptAndExtractBool(
800 client_web_content, 800 client_web_content,
801 host_action_var); 801 host_action_var);
802 } 802 }
803 803
804 } // namespace remoting 804 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/test/base/extension_load_waiter_one_shot.cc ('k') | extensions/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698