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

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

Issue 23026006: Add support for color input datalist on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 2 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 1585
1586 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { 1586 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) {
1587 if (web_contents == tab_strip_model_->GetActiveWebContents()) 1587 if (web_contents == tab_strip_model_->GetActiveWebContents())
1588 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); 1588 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
1589 } 1589 }
1590 1590
1591 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() { 1591 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() {
1592 return GetJavaScriptDialogManagerInstance(); 1592 return GetJavaScriptDialogManagerInstance();
1593 } 1593 }
1594 1594
1595 content::ColorChooser* Browser::OpenColorChooser(WebContents* web_contents, 1595 content::ColorChooser* Browser::OpenColorChooser(
1596 SkColor initial_color) { 1596 WebContents* web_contents,
1597 SkColor initial_color,
1598 const std::vector<SkColor>& suggestions,
1599 const std::vector<string16>& suggestion_labels) {
1597 return chrome::ShowColorChooser(web_contents, initial_color); 1600 return chrome::ShowColorChooser(web_contents, initial_color);
1598 } 1601 }
1599 1602
1600 void Browser::RunFileChooser(WebContents* web_contents, 1603 void Browser::RunFileChooser(WebContents* web_contents,
1601 const content::FileChooserParams& params) { 1604 const content::FileChooserParams& params) {
1602 FileSelectHelper::RunFileChooser(web_contents, params); 1605 FileSelectHelper::RunFileChooser(web_contents, params);
1603 } 1606 }
1604 1607
1605 void Browser::EnumerateDirectory(WebContents* web_contents, 1608 void Browser::EnumerateDirectory(WebContents* web_contents,
1606 int request_id, 1609 int request_id,
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
2298 if (contents && !allow_js_access) { 2301 if (contents && !allow_js_access) {
2299 contents->web_contents()->GetController().LoadURL( 2302 contents->web_contents()->GetController().LoadURL(
2300 target_url, 2303 target_url,
2301 content::Referrer(), 2304 content::Referrer(),
2302 content::PAGE_TRANSITION_LINK, 2305 content::PAGE_TRANSITION_LINK,
2303 std::string()); // No extra headers. 2306 std::string()); // No extra headers.
2304 } 2307 }
2305 2308
2306 return contents != NULL; 2309 return contents != NULL;
2307 } 2310 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698