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

Side by Side Diff: views/controls/combobox/native_combobox_views.cc

Issue 7779053: Make views_aura_desktop depend upon resources so that we don't have to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | views/views.gyp » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/controls/combobox/native_combobox_views.h" 5 #include "views/controls/combobox/native_combobox_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "ui/base/keycodes/keyboard_codes.h" 10 #include "ui/base/keycodes/keyboard_codes.h"
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED) 366 MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
367 return; 367 return;
368 dropdown_open_ = false; 368 dropdown_open_ = false;
369 369
370 // Need to explicitly clear mouse handler so that events get sent 370 // Need to explicitly clear mouse handler so that events get sent
371 // properly after the menu finishes running. If we don't do this, then 371 // properly after the menu finishes running. If we don't do this, then
372 // the first click to other parts of the UI is eaten. 372 // the first click to other parts of the UI is eaten.
373 SetMouseHandler(NULL); 373 SetMouseHandler(NULL);
374 } 374 }
375 375
376 ////////////////////////////////////////////////////////////////////////////////
377 // NativeComboboxWrapper, public:
378
379 #if defined(USE_AURA)
380 // static
381 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
382 Combobox* combobox) {
383 return new NativeComboboxViews(combobox);
384 }
385 #endif
386
376 } // namespace views 387 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698