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

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: Created 7 years, 1 month 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 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 1564
1565 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { 1565 void Browser::DidNavigateToPendingEntry(WebContents* web_contents) {
1566 if (web_contents == tab_strip_model_->GetActiveWebContents()) 1566 if (web_contents == tab_strip_model_->GetActiveWebContents())
1567 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); 1567 UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
1568 } 1568 }
1569 1569
1570 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() { 1570 content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() {
1571 return GetJavaScriptDialogManagerInstance(); 1571 return GetJavaScriptDialogManagerInstance();
1572 } 1572 }
1573 1573
1574 content::ColorChooser* Browser::OpenColorChooser(WebContents* web_contents, 1574 content::ColorChooser* Browser::OpenColorChooser(
1575 SkColor initial_color) { 1575 WebContents* web_contents,
1576 SkColor initial_color,
1577 const std::vector<SkColor>& suggestions,
1578 const std::vector<string16>& suggestion_labels) {
1576 return chrome::ShowColorChooser(web_contents, initial_color); 1579 return chrome::ShowColorChooser(web_contents, initial_color);
1577 } 1580 }
1578 1581
1579 void Browser::RunFileChooser(WebContents* web_contents, 1582 void Browser::RunFileChooser(WebContents* web_contents,
1580 const content::FileChooserParams& params) { 1583 const content::FileChooserParams& params) {
1581 FileSelectHelper::RunFileChooser(web_contents, params); 1584 FileSelectHelper::RunFileChooser(web_contents, params);
1582 } 1585 }
1583 1586
1584 void Browser::EnumerateDirectory(WebContents* web_contents, 1587 void Browser::EnumerateDirectory(WebContents* web_contents,
1585 int request_id, 1588 int request_id,
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
2271 if (contents && !allow_js_access) { 2274 if (contents && !allow_js_access) {
2272 contents->web_contents()->GetController().LoadURL( 2275 contents->web_contents()->GetController().LoadURL(
2273 target_url, 2276 target_url,
2274 content::Referrer(), 2277 content::Referrer(),
2275 content::PAGE_TRANSITION_LINK, 2278 content::PAGE_TRANSITION_LINK,
2276 std::string()); // No extra headers. 2279 std::string()); // No extra headers.
2277 } 2280 }
2278 2281
2279 return contents != NULL; 2282 return contents != NULL;
2280 } 2283 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698