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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.h

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "chrome/browser/ui/omnibox/omnibox_view.h" 14 #include "chrome/browser/ui/omnibox/omnibox_view.h"
15 #include "chrome/browser/ui/toolbar/toolbar_model.h" 15 #include "chrome/browser/ui/toolbar/toolbar_model.h"
16 #include "ui/base/window_open_disposition.h" 16 #include "ui/base/window_open_disposition.h"
17 #include "ui/gfx/range/range.h" 17 #include "ui/gfx/range/range.h"
18 #include "ui/views/controls/textfield/textfield.h" 18 #include "ui/views/controls/textfield/textfield.h"
19 #include "ui/views/controls/textfield/textfield_controller.h" 19 #include "ui/views/controls/textfield/textfield_controller.h"
20 20
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "ui/base/ime/chromeos/input_method_manager.h" 22 #include "chromeos/ime/input_method_manager.h"
23 #endif 23 #endif
24 24
25 class LocationBarView; 25 class LocationBarView;
26 class OmniboxPopupView; 26 class OmniboxPopupView;
27 class Profile; 27 class Profile;
28 28
29 namespace gfx { 29 namespace gfx {
30 class RenderText; 30 class RenderText;
31 } 31 }
32 32
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 // and gets a tap. So we use this variable to remember focus state before tap. 226 // and gets a tap. So we use this variable to remember focus state before tap.
227 bool select_all_on_gesture_tap_; 227 bool select_all_on_gesture_tap_;
228 228
229 // Used to bind callback functions to this object. 229 // Used to bind callback functions to this object.
230 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_; 230 base::WeakPtrFactory<OmniboxViewViews> weak_ptr_factory_;
231 231
232 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews); 232 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
233 }; 233 };
234 234
235 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_ 235 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698