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

Side by Side Diff: chrome_frame/ole_document_impl.h

Issue 3034033: Our InPlaceMenu implementation is only partially being used.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // TODO(slightlyoff): Add any required LICENSE block changes for MSFT code 5 // TODO(slightlyoff): Add any required LICENSE block changes for MSFT code
6 // inclusion. 6 // inclusion.
7 7
8 // ole_document_impl.h : IOleDocument implementation 8 // ole_document_impl.h : IOleDocument implementation
9 // 9 //
10 // This file is a modified version of the OleDocument.h file, which is 10 // This file is a modified version of the OleDocument.h file, which is
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 HRESULT hr = S_OK; 202 HRESULT hr = S_OK;
203 if (ui_activate) { 203 if (ui_activate) {
204 // We must know the client site first 204 // We must know the client site first
205 if (t->m_spInPlaceSite == NULL) { 205 if (t->m_spInPlaceSite == NULL) {
206 return E_UNEXPECTED; 206 return E_UNEXPECTED;
207 } 207 }
208 if (!t->m_bUIActive) { 208 if (!t->m_bUIActive) {
209 hr = t->ActiveXDocActivate(OLEIVERB_UIACTIVATE); 209 hr = t->ActiveXDocActivate(OLEIVERB_UIACTIVATE);
210 } 210 }
211 } else { 211 } else {
212 t->InPlaceMenuDestroy(); 212 // Menu integration is still not complete, so do not destroy
213 // IE's menus. If we call InPlaceMenuDestroy here, menu items such
214 // as Print etc will be disabled and we will not get calls to QueryStatus
215 // for those commands.
216 // t->InPlaceMenuDestroy();
213 // t->DestroyToolbar(); 217 // t->DestroyToolbar();
214 hr = t->UIDeactivate(); 218 hr = t->UIDeactivate();
215 } 219 }
216 return hr; 220 return hr;
217 } 221 }
218 222
219 STDMETHOD(Open)() { 223 STDMETHOD(Open)() {
220 DLOG(INFO) << __FUNCTION__ << " not implemented"; 224 DLOG(INFO) << __FUNCTION__ << " not implemented";
221 return E_NOTIMPL; 225 return E_NOTIMPL;
222 } 226 }
(...skipping 21 matching lines...) Expand all
244 DLOG(INFO) << __FUNCTION__ << " not implemented"; 248 DLOG(INFO) << __FUNCTION__ << " not implemented";
245 return E_NOTIMPL; 249 return E_NOTIMPL;
246 } 250 }
247 251
248 HRESULT ActiveXDocActivate(LONG verb) { 252 HRESULT ActiveXDocActivate(LONG verb) {
249 return E_NOTIMPL; 253 return E_NOTIMPL;
250 } 254 }
251 }; 255 };
252 256
253 #endif // CHROME_FRAME_OLE_DOCUMENT_IMPL_H_ 257 #endif // CHROME_FRAME_OLE_DOCUMENT_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698