chrome/browser/ui/views/web_intent_picker_views.cc - Issue 10534153: Use OmniboxViewViews on Win with --enable-views-textfield.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/web_intent_picker_views.cc

Issue 10534153: Use OmniboxViewViews on Win with --enable-views-textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ignore Patch Set 3; use static bool in UseOmniboxViews(). Created 8 years, 6 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/browser/ui/views/toolbar_view.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
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 #include <algorithm>	5 #include <algorithm>

6 #include <vector>	6 #include <vector>

7	7

8 #include "base/memory/scoped_vector.h"	8 #include "base/memory/scoped_vector.h"

9 #include "base/time.h"	9 #include "base/time.h"

	10 #include "base/utf_string_conversions.h"

10 #include "chrome/browser/tab_contents/tab_util.h"	11 #include "chrome/browser/tab_contents/tab_util.h"

11 #include "chrome/browser/ui/browser_navigator.h"	12 #include "chrome/browser/ui/browser_navigator.h"

12 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"	13 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h"

13 #include "chrome/browser/ui/intents/web_intent_picker.h"	14 #include "chrome/browser/ui/intents/web_intent_picker.h"

14 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"	15 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"

15 #include "chrome/browser/ui/intents/web_intent_picker_model.h"	16 #include "chrome/browser/ui/intents/web_intent_picker_model.h"

16 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"	17 #include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"

17 #include "chrome/browser/ui/tab_contents/tab_contents.h"	18 #include "chrome/browser/ui/tab_contents/tab_contents.h"

18 #include "chrome/browser/ui/views/constrained_window_views.h"	19 #include "chrome/browser/ui/views/constrained_window_views.h"

19 #include "chrome/browser/ui/views/frame/browser_view.h"	20 #include "chrome/browser/ui/views/frame/browser_view.h"

(...skipping 1143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1163 views::ImageButton* close_button = new views::ImageButton(this);	1164 views::ImageButton* close_button = new views::ImageButton(this);

1164 close_button->SetImage(views::CustomButton::BS_NORMAL,	1165 close_button->SetImage(views::CustomButton::BS_NORMAL,

1165 rb.GetImageSkiaNamed(IDR_CLOSE_BAR));	1166 rb.GetImageSkiaNamed(IDR_CLOSE_BAR));

1166 close_button->SetImage(views::CustomButton::BS_HOT,	1167 close_button->SetImage(views::CustomButton::BS_HOT,

1167 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));	1168 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));

1168 close_button->SetImage(views::CustomButton::BS_PUSHED,	1169 close_button->SetImage(views::CustomButton::BS_PUSHED,

1169 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));	1170 rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));

1170 return close_button;	1171 return close_button;

1171 }	1172 }

1172 #endif	1173 #endif

OLD	NEW